统一全部信用码改成部门ID

resource-server/src/main/java/com/zq/resource/controller/admin/DeptDutyController.java

@@ -50,7 +50,7 @@ public class DeptDutyController {
     @PostMapping(value = "/addDeptDuty")
     public ResultVo addDeptDuty(@RequestBody DeptDuty vo) {
         AssertUtils.hasText(vo.getDuties(), "缺少处室职责描述");
-        AssertUtils.hasText(vo.getCreditCode(), "缺少部门的统一信用代码");
+        AssertUtils.hasText(vo.getDeptId(), "缺少部门ID");
 
         deptDutyService.addDeptDuty(vo);
         return ResultVo.success();

resource-server/src/main/java/com/zq/resource/entity/DeptDuty.java

@@ -36,10 +36,10 @@ public class DeptDuty {
     private String duties;
 
     /**
-     * 处室统一社会信用代码
+     * 部门ID
      */
-    @ApiModelProperty("处室统一社会信用代码")
-    private String creditCode;
+    @ApiModelProperty("部门ID")
+    private String deptId;
 
     /**
      * 创建时间
@@ -66,4 +66,8 @@ public class DeptDuty {
     @TableField(updateStrategy = FieldStrategy.NOT_NULL)
     private String cascadeguid;
 
+    @ApiModelProperty("部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
 }
\ No newline at end of file

resource-server/src/main/java/com/zq/resource/service/DeptDutyService.java

@@ -9,14 +9,8 @@ import com.zq.common.utils.PagingUtils;
 import com.zq.common.vo.KeywordFindVo;
 import com.zq.common.vo.PageVo;
 import com.zq.resource.constant.ShareApiEnum;
-import com.zq.resource.dao.DeptDutyDao;
-import com.zq.resource.dao.DeptLiabilityCategoryDao;
-import com.zq.resource.dao.DeptLiabilityDao;
-import com.zq.resource.dao.DeptLiabilityLabelDao;
-import com.zq.resource.entity.DeptDuty;
-import com.zq.resource.entity.DeptLiability;
-import com.zq.resource.entity.DeptLiabilityCategory;
-import com.zq.resource.entity.DeptLiabilityLabel;
+import com.zq.resource.dao.*;
+import com.zq.resource.entity.*;
 import com.zq.resource.utils.ShareApiUtils;
 import com.zq.resource.vo.DeptDutyFindVo;
 import com.zq.resource.vo.DeptLiabilityCategoryFindVo;
@@ -44,6 +38,7 @@ public class DeptDutyService {
     private final DeptLiabilityDao deptLiabilityDao;
     private final DeptLiabilityCategoryDao deptLiabilityCategoryDao;
     private final DeptLiabilityLabelDao deptLiabilityLabelDao;
+    private final OrgDeptDao orgDeptDao;
 
     public PageVo<DeptDuty> getDeptDutyList(DeptDutyFindVo vo) {
         LambdaQueryWrapper<DeptDuty> lambdaQuery = Wrappers.lambdaQuery(DeptDuty.class);
@@ -52,11 +47,13 @@ public class DeptDutyService {
             lambdaQuery.like(DeptDuty::getDuties, vo.getDuties());
             vo.setDuties(null);
         }
-        if (StringUtils.isNotBlank(vo.getCreditCode())) {
-            lambdaQuery.like(DeptDuty::getCreditCode, vo.getCreditCode());
-            vo.setCreditCode(null);
-        }
-        return PagingUtils.paging(vo, deptDutyDao, DeptDuty.class, lambdaQuery);
+
+        PageVo<DeptDuty> paging = PagingUtils.paging(vo, deptDutyDao, DeptDuty.class, lambdaQuery);
+        paging.getRows().forEach(deptDuty -> {
+            OrgDept orgDept = orgDeptDao.selectById(deptDuty.getDeptId());
+            deptDuty.setDeptName(orgDept.getDeptName());
+        });
+        return paging;
     }
 
     public DeptDuty getDeptDutyInfo(String dutyId) {
@@ -64,6 +61,9 @@ public class DeptDutyService {
     }
 
     public void addDeptDuty(DeptDuty vo) {
+        OrgDept orgDept = orgDeptDao.selectById(vo.getDeptId());
+        AssertUtils.notNull(orgDept, "部门不存在");
+
         vo.setCreateTime(DateUtil.date());
         vo.setUpdateTime(DateUtil.date());
 
@@ -73,9 +73,11 @@ public class DeptDutyService {
     public void modifyDeptDuty(DeptDuty vo) {
         DeptDuty deptDuty = deptDutyDao.selectById(vo.getId());
         AssertUtils.notNull(deptDuty, "无此职责");
+        OrgDept orgDept = orgDeptDao.selectById(vo.getDeptId());
+        AssertUtils.notNull(orgDept, "部门不存在");
 
         deptDuty.setDuties(vo.getDuties());
-        deptDuty.setCreditCode(vo.getCreditCode());
+        deptDuty.setDeptId(vo.getDeptId());
         deptDuty.setUpdateTime(DateUtil.date());
 
         deptDutyDao.updateById(deptDuty);
@@ -192,8 +194,10 @@ public class DeptDutyService {
             DeptDuty deptDuty = deptDutyDao.selectById(id);
             if (deptDuty != null) {
                 Map<String, Object> params = new HashMap<>();
+                OrgDept orgDept = orgDeptDao.selectById(deptDuty.getDeptId());
+
                 params.put("Duties", deptDuty.getDuties());
-                params.put("credit_code", deptDuty.getCreditCode());
+                params.put("credit_code", orgDept.getCreditCode());
                 params.put("dutiesId", deptDuty.getCascadeguid());
                 ShareApiResponse shareApiResponse = ShareApiUtils.doPost(params, ShareApiEnum.DUTIES_ADD_UPDATE);
                 if (shareApiResponse.isSuccess()) {

resource-server/src/main/java/com/zq/resource/service/StandardDataService.java

@@ -53,9 +53,10 @@ public class StandardDataService {
     public void modifyStandardData(StandardData vo) {
         StandardData standardData = standardDataDao.selectById(vo.getId());
         AssertUtils.notNull(standardData, "无此数据元");
-        DataCategory dataCategory = dataCategoryDao.selectById(vo.getCategoryId());
-        AssertUtils.notNull(dataCategory, "目录不存在");
+        StandardDataMapping standardDataMapping = standardDataMappingDao.selectById(vo.getMappingId());
+        AssertUtils.notNull(standardDataMapping, "映射表不存在");
 
+        standardData.setMappingId(vo.getMappingId());
         standardData.setCategoryId(vo.getCategoryId());
         standardData.setStandardName(vo.getStandardName());
         standardData.setStandardDataType(vo.getStandardDataType());

resource-server/src/main/java/com/zq/resource/vo/DeptDutyFindVo.java

@@ -34,10 +34,10 @@ public class DeptDutyFindVo extends PageReqVo {
     private String duties;
 
     /**
-     * 处室统一社会信用代码
+     * 部门ID
      */
-    @ApiModelProperty("处室统一社会信用代码")
-    private String creditCode;
+    @ApiModelProperty("部门ID")
+    private String deptId;
 
     /**
      * 创建时间