补充评价文件上传

查询企业预警数据列表

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppXzjcjbxx025711Controller.java

@@ -34,7 +34,7 @@ public class AppXzjcjbxx025711Controller extends BaseController
      */
     @PostMapping("/queryList")
     @ResponseBody
-    public TableDataInfo queryList(Xzjcjbxx025711 xzjcjboxx)
+    public TableDataInfo queryList(@RequestBody Xzjcjbxx025711 xzjcjboxx)
     {
         startPage();
         List<Xzjcjbxx025711> list = xzjcjbxx025711Service.queryByEnterpriseNumber(xzjcjboxx);
@@ -45,7 +45,7 @@ public class AppXzjcjbxx025711Controller extends BaseController
      */
     @PostMapping("/queryQZAJList")
     @ResponseBody
-    public TableDataInfo queryQZAJList(Xzjcjbxx025711 xzjcjboxx)
+    public TableDataInfo queryQZAJList(@RequestBody Xzjcjbxx025711 xzjcjboxx)
     {
         startPage();
         List<Xzqzjbxx173774> qzajList = xzjcjbxx025711Service.queryQZAJByEnterpriseNumber(xzjcjboxx);
@@ -57,7 +57,7 @@ public class AppXzjcjbxx025711Controller extends BaseController
      */
     @PostMapping("/queryCFAJList")
     @ResponseBody
-    public TableDataInfo queryCFAJList(Xzjcjbxx025711 xzjcjboxx)
+    public TableDataInfo queryCFAJList(@RequestBody  Xzjcjbxx025711 xzjcjboxx)
     {
         startPage();
         List<Xzcfajjbxx026705> xzcfajjbxx026705s = xzjcjbxx025711Service.queryCFAJByEnterpriseNumber(xzjcjboxx);

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseEvaluate.java

@@ -4,6 +4,8 @@ import com.zdxt.common.BaseDomain;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.List;
+
 
 /**
  * 企业端-执法评价对象 enterprise_evaluate
@@ -62,6 +64,11 @@ public class EnterpriseEvaluate extends BaseDomain
      */
     private Integer checkQuality;
 
+    /**
+     * 存储上传文件
+     */
+    private List<String> fileList;
+
 
     public void setId(String id) 
     {
@@ -179,6 +186,14 @@ public class EnterpriseEvaluate extends BaseDomain
         this.checkQuality = checkQuality;
     }
 
+    public List<String> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<String> fileList) {
+        this.fileList = fileList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseEvaluateServiceImpl.java

@@ -5,12 +5,16 @@ import java.util.List;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
+import com.zdxt.auth.dto.UserBean;
+import com.zdxt.auth.feign.UserApi;
+import com.zdxt.auth.feign.ZdxtFileCommonApi;
 import com.zdxt.code.domain.EnforcementRegistration;
 import com.zdxt.code.domain.EnterpriseEvaluate;
 import com.zdxt.code.mapper.EnforcementRegistrationMapper;
 import com.zdxt.code.mapper.EnterpriseEvaluateMapper;
 import com.zdxt.code.service.IEnterpriseEvaluateService;
 import com.zdxt.common.util.DateUtils;
+import com.zdxt.common.zdxtFile.ZdxtFileCommon;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,6 +34,12 @@ public class EnterpriseEvaluateServiceImpl implements IEnterpriseEvaluateService
     @Autowired
     private EnforcementRegistrationMapper enforcementRegistrationMapper;
 
+    @Autowired
+    private UserApi userApi;
+
+    @Autowired
+    private ZdxtFileCommonApi zdxtFileCommonApi;
+
     /**
      * 查询企业端-执法评价
      * 
@@ -69,6 +79,8 @@ public class EnterpriseEvaluateServiceImpl implements IEnterpriseEvaluateService
     @Override
     public int insertEnterpriseEvaluate(EnterpriseEvaluate enterpriseEvaluate)
     {
+
+        UserBean user = userApi.getUserByUserId(enterpriseEvaluate.getUserId());
         enterpriseEvaluate.setCreateTime(DateUtils.getNowDate());
         enterpriseEvaluate.setId(IdUtil.simpleUUID());
 
@@ -81,6 +93,22 @@ public class EnterpriseEvaluateServiceImpl implements IEnterpriseEvaluateService
             enterpriseEvaluate.setEnterpriseNumber(enforcementRegistration.getEnterpriseNumber());
         }
         int i = enterpriseEvaluateMapper.insertEnterpriseEvaluate(enterpriseEvaluate);
+
+        if(i > 0 && enterpriseEvaluate.getFileList().size() > 0){
+            enterpriseEvaluate.getFileList().forEach(res ->{
+                ZdxtFileCommon zdxtFileCommon = new ZdxtFileCommon();
+                zdxtFileCommon.setBusinessId(enterpriseEvaluate.getId());
+                zdxtFileCommon.setGuid(IdUtil.simpleUUID());
+                //文件后缀
+                zdxtFileCommon.setFileSuffix("JPG");
+                zdxtFileCommon.setUploadPath(res);
+                zdxtFileCommon.setUploadPersonId(null==user.getUserId()?"":user.getUserId().toString());
+                zdxtFileCommon.setUploadPersonName(null==user.getUserName()?"":user.getUserName());
+                zdxtFileCommonApi.addZdxtFileCommon(zdxtFileCommon);
+
+            });
+        }
+
         if(i > 0){
             //变更执法登记是否评价状态
             EnforcementRegistration enforcementRegistration1 = new EnforcementRegistration();

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml

@@ -56,9 +56,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test=" enforcementDepartmentId != null  and enforcementDepartmentId != ''">
                 enforcement_department_id = #{enforcementDepartmentId},
             </if>
-            ORDER BY warning_level ASC,create_time DESC LIMIT 1000000000
         </where>
-        ) t GROUP BY t.enterprise_number
+        ORDER BY warning_level ASC,create_time DESC LIMIT 1000000000
+        ) t GROUP BY t.enterprise_number order by t.create_time desc
     </select>
     
     <select id="selectLawEnforcementWarningByEnterpriseNumber" parameterType="LawEnforcementWarningList"