feat(企标稽查整改): 基础模块

laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java

@@ -61,6 +61,10 @@ public class EnterpriseStandardInspectVo {
     @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     private String inspectUser;
 
+    /** 稽查负责人 翻译*/
+    @ApiModelProperty(value = "稽查负责人 翻译")
+    private String inspectUserDictText;
+
     /** 标准化组对接人 */
     @Excel(name = "标准化组对接人", width = 15, orderNum = "1")
     @ApiModelProperty(value = "标准化组对接人")

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java

@@ -158,7 +158,12 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
      */
     @Override
     public EnterpriseStandardInspectReport queryById(String id) {
-        return getById(id);
+        EnterpriseStandardInspectReport enterpriseStandardInspectReport = getById(id);
+        // 稽查内容查询
+        EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId());
+        enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getStandardNo());
+        enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
+        return enterpriseStandardInspectReport;
     }
 
     @Override

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java

@@ -177,14 +177,24 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl<Enterprise
     @Override
     public IPage<EnterpriseStandardInspectVo> queryByPage(EnterpriseStandardInspectVo enterpriseStandardInspectVo, Integer pageNo, Integer pageSize) {
         QueryWrapper<EnterpriseStandardInspectVo> queryWrapper = getEnterpriseStandardInspectVoQueryWrapper(enterpriseStandardInspectVo);
-        return esInspectMapper.queryByPage(new Page<>(pageNo, pageSize), queryWrapper);
+        IPage<EnterpriseStandardInspectVo> enterpriseStandardInspectVoIPage = esInspectMapper.queryByPage(new Page<>(pageNo, pageSize), queryWrapper);
+        setProperty(enterpriseStandardInspectVoIPage.getRecords());
+        return enterpriseStandardInspectVoIPage;
     }
 
     @Override
     public List<EnterpriseStandardInspectVo> queryByList(EnterpriseStandardInspectVo enterpriseStandardInspectVo) {
         QueryWrapper<EnterpriseStandardInspectVo> queryWrapper = getEnterpriseStandardInspectVoQueryWrapper(enterpriseStandardInspectVo);
         List<EnterpriseStandardInspectVo> enterpriseStandardInspectVos = esInspectMapper.queryByList(queryWrapper);
-        return enterpriseStandardInspectVos;
+        setProperty(enterpriseStandardInspectVos);
+        return esInspectMapper.queryByList(queryWrapper);
+    }
+
+    private void setProperty(List<EnterpriseStandardInspectVo> list) {
+        for (EnterpriseStandardInspectVo enterpriseStandardInspectVo : list) {
+            // 翻译
+            enterpriseStandardInspectVo.setInspectUserDictText(sysUserService.dictByIdsOrUserNames(enterpriseStandardInspectVo.getInspectUser(), ""));
+        }
     }
 
     @NotNull