校验提交

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/service/CheckResultService.java

@@ -26,7 +26,7 @@ public interface CheckResultService extends IService<CheckResult> {
 
     List<CheckResultDto> selectDetails(String batchNo,Integer modelId);
 
-    String saveSql(String amosOrgCode,String userName);
+    String saveSql(String amosOrgCode,String userName, String batchNo);
 
     /**
      * 根据机构code获取模型数据树

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/action/CheckModelAction.java

@@ -141,7 +141,7 @@ public class CheckModelAction {
 
             if (checkType == 0) {
                 // 全站校验生成报告
-                checkResultService.saveSql(orgCode, checkPeopleName);
+                checkResultService.saveSql(orgCode, checkPeopleName, batchNo);
                 List<CheckModel> checkModels = checkModelService.selectByOrgCode(orgCode);
                 checkModels.forEach(checkModel -> {
                     saveCheckModel(checkModel, batchNo);

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/controller/CheckResultController.java

@@ -94,13 +94,13 @@ public class CheckResultController extends BaseController {
     /**
      * cs
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-    @GetMapping(value = "/saveSql")
-    @ApiOperation(httpMethod = "GET", value = "result", notes = "result")
-    public ResponseModel<String> saveSql(String amosOrgCode) {
-        AgencyUserModel user = getUserInfo();
-        return ResponseHelper.buildResponse(checkResultService.saveSql(amosOrgCode,user.getUserName()));
-    }
+//    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+//    @GetMapping(value = "/saveSql")
+//    @ApiOperation(httpMethod = "GET", value = "result", notes = "result")
+//    public ResponseModel<String> saveSql(String amosOrgCode) {
+//        AgencyUserModel user = getUserInfo();
+//        return ResponseHelper.buildResponse(checkResultService.saveSql(amosOrgCode,user.getUserName()));
+//    }
 
     /**
      * cs

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/service/impl/CheckResultImpl.java

@@ -142,7 +142,8 @@ public class CheckResultImpl extends ServiceImpl<CheckResultMapper, CheckResult>
         List<TableColumnsVo> columns = subjectTreeVo.getTableCols();
         Map tableMap = checkResultMapper.getTables(subjectTreeVo.getTableName(), checkModel.getAmosOrgCode());
         List<Map<String, Object>> list = new ArrayList<>();
-        String noItem = "org_code,biz_org_code,biz_org_name,station_name,station_code,inspector";
+        //TODO 不校验项  后期提出去，或数据库增加配置
+        String noItem = "org_code,biz_org_code,biz_org_name,station_name,station_code,inspector,check_item_value,factory_classify,fire_spacing_class,auditClas,distanceType,firewallClass";
         String[] split = noItem.split(",");
         columns.forEach(tableColumnsVo -> {
             List<String> collect = Arrays.stream(split).filter(item -> item.equals(tableColumnsVo.getColumnName())).collect(Collectors.toList());
@@ -196,14 +197,14 @@ public class CheckResultImpl extends ServiceImpl<CheckResultMapper, CheckResult>
      * @param amosOrgCode
      * @return
      */
-    private Map<String,Object> getData(String amosOrgCode) {
+    private Map<String,Object> getData(String amosOrgCode, String batchNo) {
         Map<String,Object> map = new HashMap<>();
 
         //获取统计表信息
         ArrayList<Map<String, Object>> list = new ArrayList<>();
         List<CheckResultDto> selectBatch = checkResultMapper.getOne(amosOrgCode);
-        for(CheckResultDto checkResultDto1 : selectBatch){
-            List<CheckResultDto> systemList = selectStatistion( checkResultDto1.getBatchNo(), amosOrgCode);
+//        for(CheckResultDto checkResultDto1 : selectBatch){
+            List<CheckResultDto> systemList = selectStatistion(batchNo, amosOrgCode);
 
             for (CheckResultDto system : systemList) {
                 HashMap<String, Object> data = new HashMap<>();
@@ -248,7 +249,7 @@ public class CheckResultImpl extends ServiceImpl<CheckResultMapper, CheckResult>
                 map.put("list2",list2);
 
             });
-        }
+//        }
         return map;
     }
 
@@ -257,8 +258,8 @@ public class CheckResultImpl extends ServiceImpl<CheckResultMapper, CheckResult>
      * @param amosOrgCode
      * @return
      */
-    public String getUrl(String amosOrgCode) {
-        Map<String, Object> dataMap = getData(amosOrgCode);
+    public String getUrl(String amosOrgCode, String batchNo) {
+        Map<String, Object> dataMap = getData(amosOrgCode, batchNo);
         WordPowerUtils instance = WordPowerUtils.getInstance();
         String pdfUrlString = "";
         File filepdf = null;
@@ -305,8 +306,8 @@ public class CheckResultImpl extends ServiceImpl<CheckResultMapper, CheckResult>
      * @return
      */
     @Override
-    public String saveSql(String amosOrgCode,String userName){
-        String url = getUrl(amosOrgCode);
+    public String saveSql(String amosOrgCode,String userName, String batchNo){
+        String url = getUrl(amosOrgCode, batchNo);
         CheckReport checkReport = new CheckReport();
         checkReport.setReportUrl(url);
         checkReport.setCreateDate(new Date());