fetch:添加个人

adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java

@@ -37,7 +37,7 @@ import java.util.Map;
 @Validated
 @Controller
 @RequestMapping(value = "/api")
-@Api(description = "登录接口")
+@Api(tags = "登录接口")
 @Slf4j
 public class LoginRestController {
 

adc-da-main/pom.xml

@@ -60,6 +60,7 @@
             <artifactId>spring-cloud-starter-openfeign</artifactId>
             <version>2.2.0.RELEASE</version>
         </dependency>
+
 <!--        <dependency>-->
 <!--            <groupId>com.adc</groupId>-->
 <!--            <artifactId>adc-da-search</artifactId>-->

adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java

@@ -22,11 +22,11 @@ public class CodeGen {
 
     // x.x.x.x:3306/xxxx --MYSQL
     // 192.168.10.140:1521:foton_slrs_test
-    private static final String DB_IP="101.36.227.22:33050/foton_slrs_test";
+    private static final String DB_IP="192.168.10.47:3306/foton_slrs_test";
 
     private static final String DB_USER="root";
 
-    private static final String DB_PWD="1q2w3e4r";
+    private static final String DB_PWD="root";
 
 
     /**

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java

@@ -0,0 +1,61 @@
+package com.adc.da.slrs.sarInstitution.controller;
+
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
+import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService;
+import com.adc.da.slrs.sarUser.entity.TsUser;
+import com.adc.da.slrs.sarUser.service.ITsUserService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+
+/**
+* <p>
+    *  前端控制器
+    * </p>
+*
+* @author zyl
+* @since 2021-06-22
+*/
+@RestController
+@Api(tags = "|机构管理|")
+@RequestMapping("/SarInstitution/institution")
+public class TsInstitutionController extends BaseController<TsInstitution> {
+    @Autowired
+    private ITsInstitutionService tsInstitutionService;
+    @Autowired
+    private ITsUserService tsUserService;
+
+    /**
+     * 查询所有机构
+     * @return ResponseMessage<List<TsInstitution>>
+     */
+    @ApiOperation("查询所有机构")
+    @GetMapping
+    public ResponseMessage<List<TsInstitution>> getInstitution(){
+        List<TsInstitution> institutions=tsInstitutionService.getInstitution();
+        return Result.success(institutions);
+    }
+
+    /**
+     * 查询机构人员
+     * @param institutionId：机构ID
+     * @return ResponseMessage<List<TsUser>>
+     */
+    @ApiOperation("查询机构的人员")
+    @GetMapping("/user")
+    public ResponseMessage<List<TsUser>> getUserByInstitutionId(@RequestParam String institutionId){
+        List<TsUser> tsUsers=tsUserService.getUserByInstitutionId(institutionId);
+        return Result.success(tsUsers);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarInstitution.dao;
+
+import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+public interface TsInstitutionDao extends BaseMapper<TsInstitution> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java

@@ -0,0 +1,46 @@
+package com.adc.da.slrs.sarInstitution.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="TsInstitution对象", description="")
+public class TsInstitution extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId("id")
+    private String id;
+
+    @ApiModelProperty(value = "上级机构")
+    private String parentId;
+
+    @ApiModelProperty(value = "机构层级")
+    private Integer level;
+
+    @ApiModelProperty(value = "机构名")
+    private String name;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "子机构")
+    private List<TsInstitution> children;
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java

@@ -0,0 +1,24 @@
+package com.adc.da.slrs.sarInstitution.service;
+
+import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
+import com.adc.da.slrs.sarUser.entity.TsUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+public interface ITsInstitutionService extends IService<TsInstitution> {
+
+    /**
+     * 查询所有机构
+     */
+    List<TsInstitution> getInstitution();
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java

@@ -0,0 +1,60 @@
+package com.adc.da.slrs.sarInstitution.service.impl;
+
+
+import com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao;
+import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
+import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService;
+import com.adc.da.slrs.sarUser.entity.TsUser;
+import com.adc.da.slrs.sarUser.service.ITsUserService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+@Service
+public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsInstitution> implements ITsInstitutionService {
+    @Autowired
+    private TsInstitutionDao tsInstitutionDao;
+
+    /**
+     * 查询所有机构
+     */
+    @Override
+    public List<TsInstitution> getInstitution() {
+        //查询第一层机构
+        QueryWrapper<TsInstitution> institutionQueryWrapper=new QueryWrapper<>();
+        institutionQueryWrapper.eq("level",1);
+        List<TsInstitution> institutionRoot=tsInstitutionDao.selectList(institutionQueryWrapper);
+        for(TsInstitution tsInstitution:institutionRoot){
+            tsInstitution.setChildren(recursionGetInstitution(tsInstitution));
+        }
+        return institutionRoot;
+    }
+
+
+
+    /**
+     * 递归获取子机构
+     * @param tsInstitution：父机构
+     * @return List<TsInstitution>
+     */
+    private List<TsInstitution> recursionGetInstitution(TsInstitution tsInstitution){
+        QueryWrapper<TsInstitution> institutionQueryWrapper=new QueryWrapper<>();
+        institutionQueryWrapper.eq("parent_id",tsInstitution.getId());
+        List<TsInstitution> tsInstitutions=tsInstitutionDao.selectList(institutionQueryWrapper);
+        for(TsInstitution tsInstitutionNode:tsInstitutions){
+            tsInstitutionNode.setChildren(recursionGetInstitution(tsInstitutionNode));
+        }
+        return tsInstitutions;
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/controller/SarStandIssueControlCauseController.java

@@ -40,7 +40,7 @@ import java.util.List;
 */
 @RestController
 @Api(tags = "|重点问题项管控模块-事业部|")
-@RequestMapping("/sarStandIssueControlCause/sar-stand-issue-control-cause")
+@RequestMapping("/api/sarStandIssueControlCause/sar-stand-issue-control-cause")
 public class SarStandIssueControlCauseController extends BaseController<SarStandIssueControlCause> {
 
     private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/entity/SarStandIssueControlCause.java

@@ -10,11 +10,13 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -44,21 +46,27 @@ public class SarStandIssueControlCause extends BaseEntity {
 
     @ExcelProperty(value = "创建时间",converter = TimestampConverter.class)
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("CREATE_TIME")
     private Timestamp createTime;
 
-    @ExcelProperty("关闭状态")
+    @ExcelIgnore
     @ApiModelProperty(value = "关闭状态（1为开启，2为关闭）")
     @TableField("CLOSE_STATE")
     private Integer closeState;
 
     @ExcelIgnore
     @ApiModelProperty(value = "实际关闭时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("ACTUAL_CLOSE_TIME")
     private Timestamp actualCloseTime;
 
     @ExcelProperty(value = "要求关闭时间",converter = TimestampConverter.class)
     @ApiModelProperty(value = "要求关闭时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("REQUIRE_CLOSE_TIME")
     private Timestamp requireCloseTime;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/service/impl/SarStandIssueControlCauseServiceImpl.java

@@ -44,7 +44,7 @@ public class SarStandIssueControlCauseServiceImpl extends ServiceImpl<SarStandIs
         //仅查询未关闭的
         sarStandIssueControlCauseQueryWrapper.eq("close_state",1);
         if(sarStandIssueControlCausePage.getStandId()!=null){
-            sarStandIssueControlCauseQueryWrapper.eq("stand_id",sarStandIssueControlCausePage.getStandId()).or().like("stand_name","%"+sarStandIssueControlCausePage.getStandName()+"%");
+            sarStandIssueControlCauseQueryWrapper.eq("stand_id",sarStandIssueControlCausePage.getStandId()).or().like("stand_name","%"+sarStandIssueControlCausePage.getStandId()+"%");
         }
         if(sarStandIssueControlCausePage.getProductName()!=null){
             sarStandIssueControlCauseQueryWrapper.like("product_name","%"+sarStandIssueControlCausePage.getProductName()+"%");
@@ -72,7 +72,7 @@ public class SarStandIssueControlCauseServiceImpl extends ServiceImpl<SarStandIs
         //仅查询关闭的
         sarStandIssueControlCauseQueryWrapper.eq("close_state",2);
         if(sarStandIssueControlCausePage.getStandId()!=null){
-            sarStandIssueControlCauseQueryWrapper.eq("stand_id",sarStandIssueControlCausePage.getStandId()).or().like("stand_name","%"+sarStandIssueControlCausePage.getStandName()+"%");
+            sarStandIssueControlCauseQueryWrapper.eq("stand_id",sarStandIssueControlCausePage.getStandId()).or().like("stand_name","%"+sarStandIssueControlCausePage.getStandId()+"%");
         }
         if(sarStandIssueControlCausePage.getProductName()!=null){
             sarStandIssueControlCauseQueryWrapper.like("product_name","%"+sarStandIssueControlCausePage.getProductName()+"%");

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/controller/SarStandIssueControlProductController.java

@@ -41,7 +41,7 @@ import java.util.List;
 */
 @RestController
 @Api(tags = "|重点问题项管控-产品规划部|")
-@RequestMapping("/sarStandIssueControlProduct/sar-stand-issue-control-product")
+@RequestMapping("/api/sarStandIssueControlProduct/sar-stand-issue-control-product")
 public class SarStandIssueControlProductController extends BaseController<SarStandIssueControlProduct> {
 
     private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/entity/SarStandIssueControlProduct.java

@@ -10,11 +10,13 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -44,6 +46,8 @@ public class SarStandIssueControlProduct extends BaseEntity {
 
     @ExcelProperty(value = "创建时间",converter = TimestampConverter.class)
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("CREATE_TIME")
     private Timestamp createTime;
 
@@ -54,11 +58,15 @@ public class SarStandIssueControlProduct extends BaseEntity {
 
     @ExcelIgnore
     @ApiModelProperty(value = "实际关闭时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("ACTUAL_CLOSE_TIME")
     private Timestamp actualCloseTime;
 
     @ExcelProperty(value = "要求关闭时间",converter = TimestampConverter.class)
     @ApiModelProperty(value = "要求关闭时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("REQUIRE_CLOSE_TIME")
     private Timestamp requireCloseTime;
 
@@ -94,6 +102,8 @@ public class SarStandIssueControlProduct extends BaseEntity {
 
     @ExcelProperty(value = "实施时间",converter = TimestampConverter.class)
     @ApiModelProperty(value = "实施时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("IMPLEMENT_TIME")
     private Timestamp implementTime;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/service/impl/SarStandIssueControlProductServiceImpl.java

@@ -42,7 +42,7 @@ public class SarStandIssueControlProductServiceImpl extends ServiceImpl<SarStand
         //仅查询未关闭的
         sarStandIssueControlProductQueryWrapper.eq("close_state",1);
         if(sarStandIssueControlProductPage.getStandId()!=null){
-            sarStandIssueControlProductQueryWrapper.eq("stand_id",sarStandIssueControlProductPage.getStandId()).or().like("stand_name","%"+sarStandIssueControlProductPage.getStandName()+"%");
+            sarStandIssueControlProductQueryWrapper.eq("stand_id",sarStandIssueControlProductPage.getStandId()).or().like("stand_name","%"+sarStandIssueControlProductPage.getStandId()+"%");
         }
         if(sarStandIssueControlProductPage.getResponsibleUnit()!=null){
             sarStandIssueControlProductQueryWrapper.eq("responsible_unit",sarStandIssueControlProductPage.getResponsibleUnit());
@@ -66,7 +66,7 @@ public class SarStandIssueControlProductServiceImpl extends ServiceImpl<SarStand
         //仅查询关闭的
         sarStandIssueControlProductQueryWrapper.eq("close_state",2);
         if(sarStandIssueControlProductPage.getStandId()!=null){
-            sarStandIssueControlProductQueryWrapper.eq("stand_id",sarStandIssueControlProductPage.getStandId()).or().like("stand_name","%"+sarStandIssueControlProductPage.getStandName()+"%");
+            sarStandIssueControlProductQueryWrapper.eq("stand_id",sarStandIssueControlProductPage.getStandId()).or().like("stand_name","%"+sarStandIssueControlProductPage.getStandId()+"%");
         }
         if(sarStandIssueControlProductPage.getResponsibleUnit()!=null){
             sarStandIssueControlProductQueryWrapper.eq("responsible_unit",sarStandIssueControlProductPage.getResponsibleUnit());

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java

@@ -47,7 +47,7 @@ import java.util.List;
 */
 @RestController
 @Api(tags = "未符合项整改")
-@RequestMapping("/sarStandUnqualified/sar-stand-unqualified")
+@RequestMapping("/api/sarStandUnqualified/sar-stand-unqualified")
 public class SarStandUnqualifiedController extends BaseController<SarStandUnqualified> {
 
     private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class);
@@ -86,7 +86,7 @@ public class SarStandUnqualifiedController extends BaseController<SarStandUnqual
      */
     @ApiOperation("批量关闭未符合项")
     @PostMapping("/close")
-    public ResponseMessage<List<String>> closeSarStandUnqualified(@RequestBody StandUnqualifiedListVO standUnqualifiedListVO){
+    public ResponseMessage<List<String>> closeSarStandUnqualified(StandUnqualifiedListVO standUnqualifiedListVO){
         if(standUnqualifiedListVO==null||standUnqualifiedListVO.getIds().size()==0){
             return Result.error(ResponseMessageCodeEnum.ERROR.getCode(),"未传入未符合项ID",null);
         }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java

@@ -10,11 +10,13 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -44,6 +46,8 @@ public class SarStandUnqualified extends BaseEntity {
 
     @ExcelProperty(value = "创建时间",converter = TimestampConverter.class)
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("CREATE_TIME")
     private Timestamp createTime;
 
@@ -54,11 +58,15 @@ public class SarStandUnqualified extends BaseEntity {
 
     @ExcelIgnore
     @ApiModelProperty(value = "实际关闭时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("ACTUAL_CLOSE_TIME")
     private Timestamp actualCloseTime;
 
     @ExcelProperty(value = "计划关闭时间",converter = TimestampConverter.class)
     @ApiModelProperty(value = "计划关闭时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("PLAN_CLOSE_TIME")
     private Timestamp planCloseTime;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java

@@ -41,11 +41,12 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
     @Override
     public IPage<SarStandUnqualified> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
         QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
+        if(sarStandUnqualifiedPage.getStandId()!=null){
+            sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"));
+//            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
+        }
         //仅查询未关闭的
         sarStandUnqualifiedQueryWrapper.eq("close_state",1);
-        if(sarStandUnqualifiedPage.getStandId()!=null){
-            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandName()+"%");
-        }
         if(sarStandUnqualifiedPage.getProductName()!=null){
             sarStandUnqualifiedQueryWrapper.like("product_name","%"+sarStandUnqualifiedPage.getProductName()+"%");
         }
@@ -68,11 +69,13 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
     @Override
     public IPage<SarStandUnqualified> getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
         QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
+        if(sarStandUnqualifiedPage.getStandId()!=null){
+            sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"));
+//            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
+        }
+
         //仅查询关闭的
         sarStandUnqualifiedQueryWrapper.eq("close_state",2);
-        if(sarStandUnqualifiedPage.getStandId()!=null){
-            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandName()+"%");
-        }
         if(sarStandUnqualifiedPage.getProductName()!=null){
             sarStandUnqualifiedQueryWrapper.like("product_name","%"+sarStandUnqualifiedPage.getProductName()+"%");
         }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationForeignStandardController.java

@@ -20,4 +20,5 @@ import com.adc.da.base.web.BaseController;
 @RequestMapping("/sarStandardComplianceAssessResult/sar-interpretation-foreign-standard")
 public class SarInterpretationForeignStandardController extends BaseController<SarInterpretationForeignStandard> {
 
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java

@@ -0,0 +1,43 @@
+package com.adc.da.slrs.sarUser.controller;
+
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarUser.service.ITsUserService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.sarUser.entity.TsUser;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+* <p>
+    *  前端控制器
+    * </p>
+*
+* @author zxy
+* @since 2021-06-22
+*/
+@RestController
+@Api(tags = "|人员管理|")
+@RequestMapping("/sarUser/user")
+public class TsUserController extends BaseController<TsUser> {
+    @Autowired
+    private ITsUserService tsUserService;
+
+    @ApiOperation("禁用/解禁人员")
+    @PostMapping("/disable")
+    public ResponseMessage<Object> disable(@Validated(TsUser.disable.class) @RequestBody TsUser tsUser){
+        //判断disableFlag是否填入正确
+        if((!tsUser.getDisableFlag().equals("1"))&&(!tsUser.getDisableFlag().equals("0"))){
+            return Result.error("disableFlag只能是0或1");
+        }
+        return tsUserService.disable(tsUser);
+    }
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarUser.dao;
+
+import com.adc.da.slrs.sarUser.entity.TsUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+public interface TsUserDao extends BaseMapper<TsUser> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java

@@ -0,0 +1,129 @@
+package com.adc.da.slrs.sarUser.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="TsUser对象", description="")
+public class TsUser extends BaseEntity {
+
+    public interface disable{
+    }
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键Id")
+    @NotNull(message = "userId不能为空",groups = {disable.class})
+    @TableId(value = "USID")
+    private String userId;
+
+    @ApiModelProperty(value = "帐户")
+    @TableField("ACCOUNT")
+    private String account;
+
+    @ApiModelProperty(value = "密码")
+    @TableField("PASSWORD")
+    private String password;
+
+    @ApiModelProperty(value = "用户姓名")
+    @TableField("UNAME")
+    private String uname;
+
+    @ApiModelProperty(value = "用户性别（1为男，2为女）")
+    @TableField("SEX")
+    private String sex;
+
+    @ApiModelProperty(value = "用户来源")
+    @TableField("USER_SOURCE")
+    private String userSource;
+
+    @ApiModelProperty(value = "用户邮箱")
+    @TableField("EMAIL")
+    private String email;
+
+    @ApiModelProperty(value = "所属部门名称")
+    @TableField("INSTITUTION_NAME")
+    private String institutionName;
+
+    @ApiModelProperty(value = "所属部门ID")
+    @TableField("INSTITUTION_ID")
+    private String institutionId;
+
+    @ApiModelProperty(value = "岗位名")
+    @TableField("POSITION_NAME")
+    private String positionName;
+
+    @ApiModelProperty(value = "岗位ID")
+    @TableField("POSITION_ID")
+    private String positionId;
+
+    @ApiModelProperty(value = "工号")
+    @TableField("WORK_NUM")
+    private String workNum;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("EXT_INFO")
+    private String extInfo;
+
+    @TableField("OPER_USER")
+    private String operUser;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATION_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Timestamp creationTime;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("MODIFY_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Timestamp modifyTime;
+
+    @ApiModelProperty(value = "是否有效")
+    @TableField("VALID_FLAG")
+    private String validFlag;
+
+    @ApiModelProperty(value = "是否禁用（0为未禁用，1为已禁用）")
+    @NotNull(message = "disableFlag不能为空",groups = {disable.class})
+    @TableField("DISABLE_FLAG")
+    private String disableFlag;
+
+    @ApiModelProperty(value = "是否锁定")
+    @TableField("UNLOCK_FLAG")
+    private String unlockFlag;
+
+    @ApiModelProperty(value = "用户类型")
+    @TableField("USER_TYPE")
+    private String userType;
+
+    @ApiModelProperty(value = "对接单点登录用户ID")
+    @TableField("SSO_ID")
+    private String ssoId;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java

@@ -0,0 +1,33 @@
+package com.adc.da.slrs.sarUser.service;
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.slrs.sarUser.entity.TsUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+public interface ITsUserService extends IService<TsUser> {
+
+
+    /**
+     * 通过机构ID查询人员
+     * @param institutionId：机构ID
+     * @return List<TsUser>
+     */
+    List<TsUser> getUserByInstitutionId(String institutionId);
+
+    /**
+     * 封禁、解禁用户
+     * @param tsUser：目标用户
+     * @return ResponseMessage<Object>
+     */
+    ResponseMessage<Object> disable(TsUser tsUser);
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java

@@ -0,0 +1,67 @@
+package com.adc.da.slrs.sarUser.service.impl;
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarUser.entity.TsUser;
+import com.adc.da.slrs.sarUser.dao.TsUserDao;
+import com.adc.da.slrs.sarUser.service.ITsUserService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+@Service
+public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements ITsUserService {
+    @Autowired
+    private TsUserDao tsUserDao;
+
+    /**
+     * 通过机构ID查询人员
+     * @param institutionId：机构ID
+     * @return List<TsUser>
+     */
+    @Override
+    public List<TsUser> getUserByInstitutionId(String institutionId) {
+        QueryWrapper<TsUser> userQueryWrapper=new QueryWrapper<>();
+        userQueryWrapper.eq("institution_id",institutionId);
+        return tsUserDao.selectList(userQueryWrapper);
+    }
+
+    /**
+     * 封禁、解禁用户
+     * @param tsUser：目标用户
+     * @return ResponseMessage<Object>
+     */
+    @Override
+    public ResponseMessage<Object> disable(TsUser tsUser) {
+        TsUser user=tsUserDao.selectById(tsUser.getUserId());
+        if(user==null){
+            return Result.error("该用户不存在");
+        }
+        //解禁
+        if(tsUser.getDisableFlag().equals("0")){
+            if(user.getDisableFlag().equals("0")){
+                return Result.error("该用户已被解禁，请勿重复操作");
+            }
+            user.setDisableFlag("0");
+        //封禁
+        }else {
+            if(user.getDisableFlag().equals("1")){
+                return Result.error("该用户已被封禁，请勿重复操作");
+            }
+            user.setDisableFlag("1");
+        }
+        tsUserDao.updateById(user);
+        return Result.success();
+    }
+}

adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao">
+
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.sarUser.dao.TsUserDao">
+
+</mapper>