驳回增加驳回原因开发

src/main/java/com/bootdo/datas/controller/DataController.java

@@ -218,7 +218,7 @@ public class DataController {
         // 0:待审核 1:删除 2:已上报 3:通过审核 4:驳回
         data.setId(id);
         data.setDataStatus("3");
-        gyDataService.updateStatus(data);
+        gyDataService.updateStatus(data,"");
         return R.ok();
     }
 
@@ -257,7 +257,7 @@ public class DataController {
         } else {
             if(dataImportDTOList.size() > 0){
                 for(GyDataImportDTO importDTO : dataImportDTOList){
-                    gyDataService.updateStatus(importDTO);
+                    gyDataService.updateStatus(importDTO,"");
                 }
             }
         }
@@ -274,13 +274,13 @@ public class DataController {
     @PostMapping("/rebut")
     @ResponseBody
     @RequiresPermissions("datas:data:rebut")
-    public R rebut(Long id) {
+    public R rebut(Long id,String opinion) {
         log.info("驳回  id:" + id);
         GyDataImportDTO data = new GyDataImportDTO();
         // 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
         data.setId(id);
         data.setDataStatus("4");
-        gyDataService.updateStatus(data);
+        gyDataService.updateStatus(data,opinion);
         return R.ok();
     }
 
@@ -294,7 +294,7 @@ public class DataController {
     @PostMapping("/batchRebut")
     @ResponseBody
     @RequiresPermissions("datas:data:rebut")
-    public R batchRebut(@RequestParam("ids[]") Long[] ids) {
+    public R batchRebut(@RequestParam("ids[]") Long[] ids,@RequestParam("opinion")String opinion) {
         log.info("审核通过 备案主键 ids:" + ids);
         List<String> failedDataNames = new ArrayList<>();
         List<GyDataImportDTO> dataImportDTOList = new ArrayList<>();
@@ -319,7 +319,7 @@ public class DataController {
         } else {
             if(dataImportDTOList.size() > 0){
                 for(GyDataImportDTO importDTO : dataImportDTOList){
-                    gyDataService.updateStatus(importDTO);
+                    gyDataService.updateStatus(importDTO,opinion);
                 }
             }
         }
@@ -421,7 +421,7 @@ public class DataController {
                 data.setId(id);
                 data.setSendVerify("3");
                 data.setNextVerifyDept(deptId);
-                gyDataService.updateStatus(data);
+                gyDataService.updateStatus(data,"");
             }
         }
         return R.ok();

src/main/java/com/bootdo/datas/controller/DataEntryController.java

@@ -0,0 +1,51 @@
+package com.bootdo.datas.controller;
+
+
+import com.bootdo.common.annotation.Log;
+import com.bootdo.common.utils.PageUtils;
+import com.bootdo.common.utils.Query;
+import com.bootdo.datas.dto.GyDataImportDTO;
+import com.bootdo.datas.service.GyDataService;
+import com.google.common.collect.Lists;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/datas/dataEntry")
+public class DataEntryController {
+    private static Logger log = LoggerFactory.getLogger(DataEntryController.class);
+
+
+    @Autowired
+    private GyDataService gyDataService;
+
+    @GetMapping()
+    @Log("访问数据条目")
+    @RequiresPermissions("datas:dataEntry:data")
+    String Data() {
+        return "datas/dataEntry/data";
+    }
+
+    @ResponseBody
+    @GetMapping("/list")
+    @RequiresPermissions("datas:dataEntry:data")
+    public PageUtils dataEntryList(@RequestParam Map<String, Object> map) {
+        // 查询列表数据
+        Query query = new Query(map);
+        query.put("dataStatusArrs", Lists.newArrayList(0,1,2,3,4));
+
+        List<GyDataImportDTO> dataList = gyDataService.dataEntryList(query);
+        int total = gyDataService.dataEntryCountTotal(query);
+        return new PageUtils(dataList, total);
+    }
+}

src/main/java/com/bootdo/datas/controller/DataExpertController.java

@@ -133,7 +133,7 @@ public class DataExpertController {
         // 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
         data.setId(id);
         data.setDataStatus("3");
-        gyDataService.updateStatus(data);
+        gyDataService.updateStatus(data,"");
         return R.ok();
     }
 
@@ -171,7 +171,7 @@ public class DataExpertController {
         } else {
             if(dataImportDTOList.size() > 0){
                 for(GyDataImportDTO importDTO : dataImportDTOList){
-                    gyDataService.updateStatus(importDTO);
+                    gyDataService.updateStatus(importDTO,"");
                 }
             }
         }
@@ -188,13 +188,13 @@ public class DataExpertController {
     @PostMapping("/rebut")
     @ResponseBody
     @RequiresPermissions("datas:expertVerify:rebut")
-    public R rebut(Long id) {
+    public R rebut(Long id,String opinion) {
         log.info("驳回  id:" + id);
         GyDataImportDTO data = new GyDataImportDTO();
         // 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
         data.setId(id);
         data.setDataStatus("4");
-        gyDataService.updateStatus(data);
+        gyDataService.updateStatus(data,opinion);
         return R.ok();
     }
 
@@ -208,7 +208,7 @@ public class DataExpertController {
     @PostMapping("/batchRebut")
     @ResponseBody
     @RequiresPermissions("datas:expertVerify:rebut")
-    public R batchRebut(@RequestParam("ids[]") Long[] ids) {
+    public R batchRebut(@RequestParam("ids[]") Long[] ids,@RequestParam("opinion")String opinion) {
         log.info("审核通过 备案主键 ids:" + ids);
         List<String> failedDataNames = new ArrayList<>();
         List<GyDataImportDTO> dataImportDTOList = new ArrayList<>();
@@ -233,7 +233,7 @@ public class DataExpertController {
         } else {
             if(dataImportDTOList.size() > 0){
                 for(GyDataImportDTO importDTO : dataImportDTOList){
-                    gyDataService.updateStatus(importDTO);
+                    gyDataService.updateStatus(importDTO,opinion);
                 }
             }
         }
@@ -294,7 +294,7 @@ public class DataExpertController {
                 data.setDataStatus("2");
                 data.setSendVerify("3");
                 data.setNextVerifyDept(deptId);
-                gyDataService.updateStatus(data);
+                gyDataService.updateStatus(data,"");
             }
         }
         return R.ok();

src/main/java/com/bootdo/datas/controller/DataSendProvinceController.java

@@ -91,7 +91,7 @@ public class DataSendProvinceController {
                 // 0:待审核 1:删除 2:审核中 3:通过审核 4:驳回
                 data.setDataStatus("0");
                 data.setAuditStage("2");
-                gyDataService.updateStatus(data);
+                gyDataService.updateStatus(data,"");
             }
         }
         return R.ok();

src/main/java/com/bootdo/datas/controller/DataUnionController.java

@@ -146,7 +146,7 @@ public class DataUnionController {
         // 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
         data.setId(id);
         data.setDataStatus("3");
-        gyDataService.updateStatus(data);
+        gyDataService.updateStatus(data,"");
         return R.ok();
     }
 
@@ -185,7 +185,7 @@ public class DataUnionController {
         } else {
             if(dataImportDTOList.size() > 0){
                 for(GyDataImportDTO importDTO : dataImportDTOList){
-                    gyDataService.updateStatus(importDTO);
+                    gyDataService.updateStatus(importDTO,"");
                 }
             }
         }
@@ -203,13 +203,13 @@ public class DataUnionController {
     @PostMapping("/rebut")
     @ResponseBody
     @RequiresPermissions("datas:unionVerify:rebut")
-    public R rebut(Long id) {
+    public R rebut(Long id,String opinion) {
         log.info("驳回  id:" + id);
         GyDataImportDTO data = new GyDataImportDTO();
         // 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
         data.setId(id);
         data.setDataStatus("4");
-        gyDataService.updateStatus(data);
+        gyDataService.updateStatus(data,opinion);
         return R.ok();
     }
 
@@ -223,7 +223,7 @@ public class DataUnionController {
     @PostMapping("/batchRebut")
     @ResponseBody
     @RequiresPermissions("datas:unionVerify:rebut")
-    public R batchRebut(@RequestParam("ids[]") Long[] ids) {
+    public R batchRebut(@RequestParam("ids[]") Long[] ids,@RequestParam("opinion")String opinion) {
         log.info("审核通过 备案主键 ids:" + ids);
         List<String> failedDataNames = new ArrayList<>();
         List<GyDataImportDTO> dataImportDTOList = new ArrayList<>();
@@ -247,7 +247,7 @@ public class DataUnionController {
         } else {
             if(dataImportDTOList.size() > 0){
                 for(GyDataImportDTO importDTO : dataImportDTOList){
-                    gyDataService.updateStatus(importDTO);
+                    gyDataService.updateStatus(importDTO,opinion);
                 }
             }
         }

src/main/java/com/bootdo/datas/controller/DataVerifyController.java

@@ -122,7 +122,7 @@ public class DataVerifyController {
         // 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
         data.setId(id);
         data.setDataStatus("3");
-        gyDataService.updateStatus(data);
+        gyDataService.updateStatus(data,"");
         return R.ok();
     }
 
@@ -160,7 +160,7 @@ public class DataVerifyController {
         } else {
             if(dataImportDTOList.size() > 0){
                 for(GyDataImportDTO importDTO : dataImportDTOList){
-                    gyDataService.updateStatus(importDTO);
+                    gyDataService.updateStatus(importDTO,"");
                 }
             }
         }
@@ -177,14 +177,14 @@ public class DataVerifyController {
     @PostMapping("/rebut")
     @ResponseBody
     @RequiresPermissions("datas:dataVerify:rebut")
-    public R rebut(Long id) {
+    public R rebut(Long id,String opinion) {
         log.info("驳回  id:" + id);
         GyDataImportDTO data = new GyDataImportDTO();
         // 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
         data.setId(id);
         data.setDataStatus("4");
         data.setAuditStage("1");
-        gyDataService.updateStatus(data);
+        gyDataService.updateStatus(data,opinion);
         return R.ok();
     }
 
@@ -198,7 +198,7 @@ public class DataVerifyController {
     @PostMapping("/batchRebut")
     @ResponseBody
     @RequiresPermissions("datas:dataVerify:rebut")
-    public R batchRebut(@RequestParam("ids[]") Long[] ids) {
+    public R batchRebut(@RequestParam("ids[]") Long[] ids,@RequestParam("opinion")String opinion) {
         log.info("审核驳回 备案主键 ids:" + ids);
         List<String> failedDataNames = new ArrayList<>();
         List<GyDataImportDTO> dataImportDTOList = new ArrayList<>();
@@ -222,7 +222,7 @@ public class DataVerifyController {
         } else {
             if(dataImportDTOList.size() > 0){
                 for(GyDataImportDTO importDTO : dataImportDTOList){
-                    gyDataService.updateStatus(importDTO);
+                    gyDataService.updateStatus(importDTO,opinion);
                 }
             }
         }
@@ -312,7 +312,7 @@ public class DataVerifyController {
         } else {
             if(dataImportDTOList.size() > 0){
                 for(GyDataImportDTO importDTO : dataImportDTOList){
-                    gyDataService.updateStatus(importDTO);
+                    gyDataService.updateStatus(importDTO,"");
                 }
             }
         }
@@ -357,7 +357,7 @@ public class DataVerifyController {
         } else {
             if(dataImportDTOList.size() > 0){
                 for(GyDataImportDTO importDTO : dataImportDTOList){
-                    gyDataService.updateStatus(importDTO);
+                    gyDataService.updateStatus(importDTO,"");
                 }
             }
         }

src/main/java/com/bootdo/datas/controller/GyDataImportController.java

@@ -216,7 +216,7 @@ public class GyDataImportController {
                 // 0:待审核 1:删除 2:审核中 3:通过审核 4:驳回 5:联合审批 6:终审
                 data.setDataStatus("2");
                 data.setRoleId(roleId);
-                gyDataService.updateStatus(data);
+                gyDataService.updateStatus(data,"");
             }
         }
         return R.ok();

src/main/java/com/bootdo/datas/dto/ExamineLogDTO.java

@@ -34,4 +34,6 @@ public class ExamineLogDTO {
 	// 创建时间
 	private Date gmtCreate;
 
+	// 驳回意见
+	private String opinion;
 }

src/main/java/com/bootdo/datas/service/GyDataService.java

@@ -31,7 +31,7 @@ public interface GyDataService {
 
     int countTotal4Del(Map<String, Object> map);
 
-    void updateStatus(GyDataImportDTO data);
+    void updateStatus(GyDataImportDTO data,String opinion);
 
     void addExpertOpinion(ExpertOpinionDO expertOpinionDO);
 
@@ -51,4 +51,8 @@ public interface GyDataService {
     void encryptExports(HttpServletResponse responses, String idValue) throws Exception;
 
     int countAaAssData(Long id);
+
+    List<GyDataImportDTO> dataEntryList(Map<String, Object> map);
+
+    int dataEntryCountTotal(Map<String, Object> map);
 }

src/main/java/com/bootdo/datas/service/impl/GyDataServiceImpl.java

@@ -51,7 +51,7 @@ public class GyDataServiceImpl implements GyDataService {
     @Value("${deployType:#{null}}")
     public String deployType;
 
-    @Value("${sysProvince:#{null}}")
+        @Value("${sysProvince:#{null}}")
     public String sysProvince;
 
     @Value("${sysCity:#{null}}")
@@ -549,7 +549,7 @@ public class GyDataServiceImpl implements GyDataService {
     }
 
     @Override
-    public void updateStatus(GyDataImportDTO data) {
+    public void updateStatus(GyDataImportDTO data,String opinion) {
         int effect = gyDataDao.updateStatus(data);
 
         if ("2".equalsIgnoreCase(data.getDataStatus()) && effect > 0) {
@@ -581,9 +581,10 @@ public class GyDataServiceImpl implements GyDataService {
                 dto.setUniqueKey(String.valueOf(data.getId()));
                 dto.setDataType("DI_OPER");
                 dto.setMessage("数据已被(" + roleDO.getRoleName() + ")审核驳回, 请核对");
+                dto.setOpinion(opinion);
                 examineLogService.save(dto);
             }
-            if("四川省".equals(this.sysProvince)){
+            if("湖南".equals(this.sysProvince)){
                 //通过数据id，查询数据信息
                 GyDataImportDTO importDTO = gyDataDao.get(data.getId());
                 if(Objects.nonNull(importDTO)){
@@ -779,6 +780,16 @@ public class GyDataServiceImpl implements GyDataService {
         return gyDataDao.countAaAssData(id);
     }
 
+    @Override
+    public List<GyDataImportDTO> dataEntryList(Map<String, Object> map) {
+          return gyDataDao.list(map);
+    }
+
+    @Override
+    public int dataEntryCountTotal(Map<String, Object> map) {
+        return gyDataDao.countTotal(map);
+    }
+
     /**
      * @Description: MultipartFile转file
      * @Author: wangp

src/main/resources/mybatis/datas/ExamineLogMapper.xml

@@ -22,12 +22,13 @@
     </select>
 
     <insert id="save">
-        insert into examine_log (data_type, unique_key, message, user_id_create)
+        insert into examine_log (data_type, unique_key, message, user_id_create,opinion)
         values (
             #{dto.dataType},
             #{dto.uniqueKey},
             #{dto.message},
-            #{dto.userIdCreate}
+            #{dto.userIdCreate},
+            #{dto.opinion}
         )
     </insert>