Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java

@@ -97,13 +97,13 @@ public class WaterResourceDto extends BaseDto {
 	@ApiModelProperty(value = "建造日期")
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private String buildDate;
+	private Date buildDate;
 
 	@ExcelProperty(value = "启用日期", index = 8)
 	@ApiModelProperty(value = "启用日期")
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private String enableDate;
+	private Date enableDate;
 
 	@ExcelIgnore
 	@ApiModelProperty(value = "方位图集合")

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml

@@ -600,7 +600,7 @@ WHERE
             ou.sequence_nbr as id,
             ou.biz_org_name as userName,
             IFNULL( MAX( CASE WHEN cfi.field_code = 'telephone' THEN field_value END ), '' ) AS telephone,
-            IFNULL( MAX( CASE WHEN cfi.field_code = 'postTypeName' THEN field_value END ), '' ) AS postTypeName,
+            IF(MAX( CASE WHEN cfi.field_code = 'postTypeName' THEN field_value END ) = '', NULL, MAX( CASE WHEN cfi.field_code = 'postTypeName' THEN field_value END )) AS postTypeName,
             IFNULL( MAX( CASE WHEN cfi.field_code = 'personImg' THEN field_value END ), '' ) AS personImg,
             IFNULL( MAX( CASE WHEN cfi.field_code = 'peopleType' THEN field_value END ), '' ) AS peopleType
         FROM

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -438,10 +438,11 @@ public class FireFightingSystemController extends AbstractBaseController {
             QueryWrapper<EquipmentCategory> equipmentCategoryQueryWrapper = new QueryWrapper<>();
             equipmentCategoryQueryWrapper.eq("code", equipTypeAmountPage.getEquipmentClassificationCode());
             equipmentCategoryQueryWrapper.eq("industry_code", equipTypeAmountPage.getIndustryCode());
-            EquipmentCategory equipmentCategory = equipmentCategoryService.getOne(equipmentCategoryQueryWrapper);
-            if (equipmentCategory == null) {
+            List<EquipmentCategory> equipmentCategoryList = equipmentCategoryService.list(equipmentCategoryQueryWrapper);
+            if (CollectionUtils.isEmpty(equipmentCategoryList)) {
                 throw new RuntimeException("装备定义code有误");
             }
+            EquipmentCategory equipmentCategory = equipmentCategoryList.get(0);
             int inhierarchy = 1;
             for (int i = 0; i < result.length + 1; i++) {
                 //进来先判断是否默认就是空，如果为空第一层
@@ -459,7 +460,7 @@ public class FireFightingSystemController extends AbstractBaseController {
                 }
             }
 
-            return fireFightingSystemService.getColaCategoryAmountEquList(inhierarchy, equipTypeAmountPage.getEquipmentClassificationCode().substring(0, inhierarchy), equipTypeAmountPage);
+            return fireFightingSystemService.getColaCategoryAmountEquList(inhierarchy, equipTypeAmountPage.getEquipmentClassificationCode().replaceAll("0+$", ""), equipTypeAmountPage);
         } else {
             if (null != equipTypeAmountPage.getIsDefect() && 1 == equipTypeAmountPage.getIsDefect()) {
                 ReginParams reginParams = getSelectedOrgInfo();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FormInstanceController.java

@@ -61,6 +61,13 @@ public class FormInstanceController extends AbstractBaseController {
         String orgCode = getOrgCode();
         return formInstanceEquipService.updateForm(instanceId, orgCode, map, groupCode);
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "删除")
+    @DeleteMapping(value = "/{instanceId}")
+    public Boolean delete(@PathVariable Long instanceId) {
+        return formInstanceEquipService.deleteInstanceById(instanceId);
+    }
 }
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.yeejoin.equipmanage.common.datasync.vo.FireEquipmentVO;
+import com.yeejoin.equipmanage.common.entity.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,10 +16,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipment;
 import com.yeejoin.equipmanage.common.dto.EquipmentSpecificDto;
 import com.yeejoin.equipmanage.common.dto.UserDto;
-import com.yeejoin.equipmanage.common.entity.EquipmentCategory;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
-import com.yeejoin.equipmanage.common.entity.MaintenanceResourceData;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
 import com.yeejoin.equipmanage.common.entity.vo.ComplementCodeVO;
 import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
@@ -220,7 +217,7 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
      */
     List<Map<String, Object>> queryCompanyStaData();
 
-    String getEquipmentBySpecificId(@Param("specificId") Long specificId);
+    Equipment getEquipmentBySpecificId(@Param("specificId") Long specificId);
 
     List<EquiplistSpecificBySystemVO> getListByWarehouseStructureId(Long floorId);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java

@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.IotSystemAlarmRo;
@@ -110,6 +111,9 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
     private EquipmentSpecificMapper equipmentSpecificMapper;
 
     @Autowired
+    private EquipmentMapper equipmentMapper;
+
+    @Autowired
     private EquipmentSpecificAlarmMapper equipmentSpecificAlarmMapper;
     
     @Autowired
@@ -177,8 +181,14 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
                 ent.setEquipmentSpecificAlarmId(equipmentSpecificAlarmId);
                 ent.setEquipmentSpecificId(alarmLog.getEquipmentSpecificId());
                 ent.setEquipmentSpecificIndexKey(alarmLog.getEquipmentSpecificIndexKey());
-                String cleanType = equipmentSpecificMapper.getEquipmentBySpecificId(alarmLog.getEquipmentSpecificId());
-                if (StringUtil.isNotEmpty(cleanType) && AlarmCleanTypeEnum.QRXC.getCode().equals(cleanType)) {
+                Equipment equipment = equipmentSpecificMapper.getEquipmentBySpecificId(alarmLog.getEquipmentSpecificId());
+                if (!StringUtil.isNotEmpty(equipment.getCleanType())) {
+                    // 若此装备未定义消除策略，默认设置为复位信号自动消除
+                    equipment.setCleanType(AlarmCleanTypeEnum.ZDXC.getCode());
+                    equipmentMapper.updateById(equipment);
+                }
+
+                if (StringUtil.isNotEmpty(equipment.getCleanType()) && AlarmCleanTypeEnum.QRXC.getCode().equals(equipment.getCleanType())) {
                     EquipmentSpecificAlarm alarm = equipmentSpecificAlarmMapper.selectById(alarmLog.getEquipmentSpecificAlarmId());
                     alarm.setStatus(AlarmStatusEnum.HF.getCode());
                     equipmentSpecificAlarmMapper.updateById(alarm);
@@ -214,8 +224,8 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
             Date date = new Date();
             SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String dateString = formatter.format(date);
-            ent.setDefectBatchId(UUID.randomUUID().toString().replace("-", "").toLowerCase());
             if (ent.isAddDefect()) {
+                ent.setDefectBatchId(UUID.randomUUID().toString().replace("-", "").toLowerCase());
                 ent.setResolveResult(dateString + " " + userModel.getRealName() + " 添加为缺陷进行消缺。");
             } else {
                 ent.setResolveResult(dateString + " " + userModel.getRealName() + " 进行警情确认处理。");

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -746,6 +746,7 @@
     <select id="getEquipSpecificDetail"
             resultType="com.yeejoin.equipmanage.common.datasync.entity.FireEquipment">
          SELECT
+            DISTINCT
             es.id,
             es.`code` AS mrid,
             es.`code` AS materialObjectId,
@@ -1525,23 +1526,27 @@
     </select>
     <select id="queryCompanyStaData" resultType="java.util.Map">
         SELECT
-        s.biz_org_code as bizOrgCode,
-        c.code as categoryCode,
-        count(1) as total
+            s.biz_org_code AS bizOrgCode,
+            c.`code` AS categoryCode,
+            count( 1 ) AS total
         FROM
-        `wl_equipment_specific` s,
-        wl_equipment e,
-        wl_equipment_category c
-        where
-        s.equipment_code = e.`code`
-        and e.category_id = c.id
-        and s.biz_org_code <![CDATA[<>]]> ''
-        GROUP BY s.biz_org_code ,c.code
+            `wl_equipment_specific` s
+                LEFT JOIN wl_equipment_detail ed ON ed.id = s.equipment_detail_id
+                LEFT JOIN wl_equipment e ON e.id = ed.equipment_id
+                LEFT JOIN wl_equipment_category c ON c.id = e.category_id
+        WHERE
+            s.biz_org_code != ''
+	        AND s.biz_org_code IS NOT NULL
+	        AND c.`code` IS NOT NULL
+	        AND c.`code` != ''
+        GROUP BY
+            s.biz_org_code,
+            c.`code`
     </select>
 
-    <select id="getEquipmentBySpecificId" resultType="String">
+    <select id="getEquipmentBySpecificId" resultType="com.yeejoin.equipmanage.common.entity.Equipment">
         select
-         we.clean_type
+            we.*
         from
          wl_equipment we
          LEFT JOIN `wl_equipment_detail` wed ON wed.equipment_id = we.id

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -1954,7 +1954,8 @@
             LEFT JOIN wl_equipment_category wec ON wle.category_id = wec.id
             WHERE 1=1
             <if test="codeHead!=null and codeHead!='' and codeHead!=' '">
-                and LEFT (wle.CODE, #{hierarchy}) = #{codeHead}
+<!--                and LEFT (wle.CODE, #{hierarchy}) = #{codeHead}-->
+                and wec.`code` like concat(#{codeHead}, '%')
             </if>
             <if test="equipTypeAmountPage.industryCode!=null">
                 and wec.industry_code = #{equipTypeAmountPage.industryCode}
@@ -4847,7 +4848,10 @@
     <select id="getPipeNetworkBySuper" resultType="java.util.Map">
         SELECT
             a.`name`,
-            IFNULL(a.area, '') AS area,
+            (CASE WHEN
+            LENGTH(trim(a.area)) = 0 THEN '--'
+            ELSE
+            IFNULL(a.area, '--') END) AS area,
             a.id,
             IFNULL(a.nowPressure, '--') AS nowPressure,
             a.nowPressureDate,

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/mapper/CheckResultMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto;
 import com.yeejoin.amos.boot.module.tdc.api.entity.CheckResult;
+import org.apache.ibatis.annotations.Param;
 import org.mapstruct.Mapper;
 
 import java.util.List;
@@ -29,4 +30,7 @@ public interface CheckResultMapper extends BaseMapper<CheckResult> {
 
     List<CheckResultDto> getOne(String amosOrgCode);
 
+    List<CheckResult> getCheckItemNo(@Param("modelName") String modelName);
+
+    Map<String, Object> selectCheckItemTotal(@Param("modelName") String modelName);
 }

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/mapper/ModelItemMapper.java

@@ -2,11 +2,15 @@ package com.yeejoin.amos.boot.module.tdc.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.tdc.api.entity.ModelItem;
+import org.apache.ibatis.annotations.Param;
 import org.mapstruct.Mapper;
 
+import java.util.List;
+
 /**
  * @author DELL
  */
 @Mapper
 public interface ModelItemMapper extends BaseMapper<ModelItem> {
+    List<ModelItem> getListByName(@Param("modelName") String modelName, @Param("orgCode") String orgCode);
 }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tdc.api.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.tdc.api.entity.CheckReport;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
@@ -16,4 +17,5 @@ public interface CheckReportService  extends IService<CheckReport> {
 
     Map getInfo(int pageNumber,int pageSize);
 
+    void createReport(String batchNo, AgencyUserModel userInfo);
 }

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

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto;
 import com.yeejoin.amos.boot.module.tdc.api.dto.DimensionTableDto;
 import com.yeejoin.amos.boot.module.tdc.api.dto.ModelTreeDto;
 import com.yeejoin.amos.boot.module.tdc.api.entity.CheckResult;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -58,4 +59,9 @@ public interface CheckResultService extends IService<CheckResult> {
 
     List<DimensionTableDto> getDimensionTable(String id);
 
+    List<ModelTreeDto> getModelTreeData(String modelName, AgencyUserModel userInfo);
+
+    List<CheckResult> getCheckItem(String modelName, AgencyUserModel userInfo);
+
+    Map<String, Object> selectCheckItemTotal(String modelName, AgencyUserModel userInfo);
 }

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

 package com.yeejoin.amos.boot.module.tdc.api.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.tdc.api.entity.ModelItem;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/resources/mapper/CheckResultMapper.xml

@@ -36,4 +36,47 @@
         select amos_org_name,amos_org_code,batch_no,model_id from tdc_check_result where amos_org_code = #{amosOrgCode} group by model_name ORDER BY check_date desc limit 0,1;
     </select>
 
+    <select id="getCheckItemNo" resultType="com.yeejoin.amos.boot.module.tdc.api.entity.CheckResult">
+        SELECT
+		    *
+        FROM
+            tdc_check_result
+        WHERE
+            batch_no = (
+            SELECT
+                batch_no
+            FROM
+                tdc_submit_record
+            ORDER BY
+                submit_time DESC
+                LIMIT 1
+            )
+            AND check_item_result = 1
+        <if test="modelName != null and modelName != '' and modelName != '-1'">
+            AND model_name =  #{modelName}
+        </if>
+    </select>
+
+    <select id="selectCheckItemTotal" resultType="java.util.Map">
+        SELECT
+			count(1) AS total, COUNT(CASE WHEN (check_item_result=1) THEN check_item_result END) AS unqualified, batch_no AS batchNo
+        FROM
+            tdc_check_result
+        WHERE
+            batch_no = (
+            SELECT
+                batch_no
+            FROM
+                tdc_submit_record
+           -- WHERE
+                -- amos_org_code = '50*110'
+            ORDER BY
+                submit_time DESC
+                LIMIT 1
+            )
+            <if test="modelName != null and modelName != '' and modelName != '-1'">
+                AND model_name =  #{modelName}
+            </if>
+    </select>
+
 </mapper>
\ No newline at end of file

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/resources/mapper/ModelItemMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.tdc.api.mapper.ModelItemMapper">
+    <select id="getListByName" resultType="com.yeejoin.amos.boot.module.tdc.api.entity.ModelItem">
+        SELECT
+            sequence_nbr, check_item_label, check_item_value, model_name, submit_record_id
+        FROM
+            tdc_model_item
+        WHERE
+            submit_record_id = (
+            SELECT
+                sequence_nbr
+            FROM
+                tdc_submit_record
+            WHERE
+                amos_org_code = #{orgCode}
+            ORDER BY
+                submit_time DESC
+                LIMIT 1
+            )
+        <if test="modelName != null and modelName != '' and modelName != '-1'">
+            AND model_name =  #{modelName}
+        </if>
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -93,6 +93,7 @@ public class CheckModelAction {
         checkResult.setCheckItemResult(result);
         checkResult.setCheckExplain(checkExplain);
         checkResult.setCheckItem(checkItem);
+        checkResult.setCheckItemLabel(checkItem);
         checkResult.setCheckItemValue(checkItemValue);
         checkResult.setModelId(String.valueOf(checkModel.getSequenceNbr()));
         checkResult.setAmosOrgCode(checkModel.getAmosOrgCode());

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

 package com.yeejoin.amos.boot.module.tdc.biz.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.tdc.api.entity.CheckReport;
 import com.yeejoin.amos.boot.module.tdc.api.service.CheckReportService;
 import com.yeejoin.amos.boot.module.tdc.biz.service.impl.CheckReportImpl;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 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.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -24,7 +27,7 @@ import java.util.Map;
 @RestController
 @Api(tags = "校验报告api")
 @RequestMapping(value = "/report")
-public class CheckReportController {
+public class CheckReportController extends BaseController {
 
     @Autowired
     CheckReportService checkReportService;
@@ -41,7 +44,6 @@ public class CheckReportController {
         return ResponseHelper.buildResponse(checkReportService.selectAll(current,size,amosOrgCode));
     }
 
-
     /**
      *
      * return
@@ -53,4 +55,13 @@ public class CheckReportController {
         return ResponseHelper.buildResponse(checkReportService.getInfo(pageNumber,pageSize));
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "createReport")
+    @ApiOperation(httpMethod = "GET",value = "创建报告",  notes = "创建报告")
+    public ResponseModel createReport(String batchNo) {
+        AgencyUserModel userInfo = getUserInfo();
+        checkReportService.createReport(batchNo, userInfo);
+        return ResponseHelper.buildResponse(true);
+    }
+
 }

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

@@ -11,10 +11,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -118,5 +115,27 @@ public class CheckResultController extends BaseController {
         return ResponseHelper.buildResponse(checkResultService.getDimensionTable(id));
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "/getModelTreeData")
+    @ApiOperation(httpMethod = "GET",value = "获取单独模型树",  notes = "根据模型id获取模型树")
+    public ResponseModel<List<ModelTreeDto>> getModelTreeData(@RequestParam(required = false) String modelName) {
+        AgencyUserModel userInfo = getUserInfo();
+        return ResponseHelper.buildResponse(checkResultService.getModelTreeData(modelName, userInfo));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "/getCheckItemNo")
+    @ApiOperation(httpMethod = "GET",value = "获取不合格校验项",  notes = "获取不合格校验项")
+    public ResponseModel<List<CheckResult>> getCheckItem(@RequestParam(required = false) String modelName) {
+        AgencyUserModel userInfo = getUserInfo();
+        return ResponseHelper.buildResponse(checkResultService.getCheckItem(modelName, userInfo));
+    }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "/selectCheckItemTotal")
+    @ApiOperation(httpMethod = "GET", value = "获取校验项统计", notes = "获取校验项统计")
+    public ResponseModel<Map<String, Object>> selectCheckItemTotal(@RequestParam(required = false) String modelName) {
+        AgencyUserModel userInfo = getUserInfo();
+        return ResponseHelper.buildResponse(checkResultService.selectCheckItemTotal(modelName, userInfo));
+    }
 }

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

@@ -7,17 +7,24 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import com.yeejoin.amos.boot.module.tdc.api.dto.ModelTreeDto;
 import com.yeejoin.amos.boot.module.tdc.api.entity.CheckReport;
 import com.yeejoin.amos.boot.module.tdc.api.enums.ReportStateEnum;
 import com.yeejoin.amos.boot.module.tdc.api.feign.IdxFeignService;
 import com.yeejoin.amos.boot.module.tdc.api.mapper.CheckReportMapper;
 import com.yeejoin.amos.boot.module.tdc.api.service.CheckReportService;
+import com.yeejoin.amos.boot.module.tdc.api.service.CheckResultService;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import springfox.documentation.spring.web.json.Json;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -29,6 +36,9 @@ public class CheckReportImpl extends ServiceImpl<CheckReportMapper, CheckReport>
     @Autowired
     IdxFeignService idxFeignService;
 
+    @Autowired
+    CheckResultService checkResultService;
+
     @Override
     public IPage<CheckReport> selectAll(int current,int size,String amosOrgCode) {
         Page<CheckReport> page = new Page<>(current,size);
@@ -78,4 +88,14 @@ public class CheckReportImpl extends ServiceImpl<CheckReportMapper, CheckReport>
 
     }
 
+    @Override
+    public void createReport(String batchNo, AgencyUserModel userInfo) {
+        List<CompanyModel> companyList = userInfo.getCompanys();
+        if (!CollectionUtils.isEmpty(companyList)) {
+            String orgCode = companyList.get(0).getOrgCode();
+            String realName = userInfo.getRealName();
+            checkResultService.saveSql(orgCode, realName, batchNo);
+        }
+    }
+
 }

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

@@ -15,15 +15,13 @@ import com.stoyanr.evictor.queue.NavigableMapEvictionQueue;
 import com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto;
 import com.yeejoin.amos.boot.module.tdc.api.dto.DimensionTableDto;
 import com.yeejoin.amos.boot.module.tdc.api.dto.ModelTreeDto;
-import com.yeejoin.amos.boot.module.tdc.api.entity.CheckModel;
-import com.yeejoin.amos.boot.module.tdc.api.entity.CheckReport;
-import com.yeejoin.amos.boot.module.tdc.api.entity.CheckResult;
-import com.yeejoin.amos.boot.module.tdc.api.entity.PowerReportFile;
+import com.yeejoin.amos.boot.module.tdc.api.entity.*;
 import com.yeejoin.amos.boot.module.tdc.api.enums.WordPowerTypeEum;
 import com.yeejoin.amos.boot.module.tdc.api.feign.IdxFeignService;
 import com.yeejoin.amos.boot.module.tdc.api.mapper.CheckModelMapper;
 import com.yeejoin.amos.boot.module.tdc.api.mapper.CheckReportMapper;
 import com.yeejoin.amos.boot.module.tdc.api.mapper.CheckResultMapper;
+import com.yeejoin.amos.boot.module.tdc.api.mapper.ModelItemMapper;
 import com.yeejoin.amos.boot.module.tdc.api.service.CheckReportService;
 import com.yeejoin.amos.boot.module.tdc.api.service.CheckResultService;
 import com.yeejoin.amos.boot.module.tdc.api.utils.WordPowerUtils;
@@ -31,11 +29,13 @@ import com.yeejoin.amos.boot.module.tdc.api.vo.SubjectTreeVo;
 import com.yeejoin.amos.boot.module.tdc.api.vo.TableColumnsVo;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import liquibase.pro.packaged.M;
 import org.codehaus.jettison.json.JSONString;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -65,6 +65,8 @@ public class CheckResultImpl extends ServiceImpl<CheckResultMapper, CheckResult>
     @Autowired
     CheckModelMapper checkModelMapper;
 
+    @Autowired
+    ModelItemMapper modelItemMapper;
 
     @Override
     public IPage<CheckResultDto> selectResult(int current,int size,String code) {
@@ -345,6 +347,50 @@ public class CheckResultImpl extends ServiceImpl<CheckResultMapper, CheckResult>
         }
     }
 
+    @Override
+    public List<ModelTreeDto> getModelTreeData(String modelName, AgencyUserModel user) {
+        List<CompanyModel> companyList = user.getCompanys();
+        List<ModelTreeDto> list = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(companyList)) {
+            String companyName = companyList.get(0).getCompanyName();
+            String orgCode = companyList.get(0).getOrgCode();
+
+            List<ModelItem> listByName = modelItemMapper.getListByName(modelName, orgCode);
+            if (!CollectionUtils.isEmpty(listByName)) {
+                Map<String, List<ModelItem>> collect = listByName.stream().collect(Collectors.groupingBy(ModelItem::getModelName));
+                collect.forEach((key, value) -> {
+                    ModelTreeDto modelTreeDto = new ModelTreeDto();
+                    modelTreeDto.setAmosOrgName(companyName);
+                    modelTreeDto.setName(key);
+                    modelTreeDto.setId(key);
+                    List<Map<String, Object>> valueList = value.stream().map(e -> {
+                        Map<String, Object> map = new HashMap<>(3);
+                        map.put("data", e.getCheckItemValue());
+                        map.put("id", e.getSequenceNbr());
+                        map.put("name", e.getCheckItemLabel());
+                        return map;
+                    }).collect(Collectors.toList());
+                    modelTreeDto.setChildren(valueList);
+                    list.add(modelTreeDto);
+                });
+            }
+        }
+        return list;
+    }
 
+    @Override
+    public List<CheckResult> getCheckItem(String modelName, AgencyUserModel userInfo) {
+//        List<CompanyModel> companyList = userInfo.getCompanys();
+//        List<CheckResult> resultList = new ArrayList<>();
+//        if (!CollectionUtils.isEmpty(companyList)) {
+//            String orgCode = companyList.get(0).getOrgCode();
+//            resultList = checkResultMapper.getCheckItemNo(modelName, orgCode);
+//        }
+        return checkResultMapper.getCheckItemNo(modelName);
+    }
 
+    @Override
+    public Map<String, Object> selectCheckItemTotal(String modelName, AgencyUserModel userInfo) {
+        return checkResultMapper.selectCheckItemTotal(modelName);
+    }
 }

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

@@ -43,6 +43,9 @@ public class ModelItemServiceImpl extends ServiceImpl<ModelItemMapper, ModelItem
     @Autowired
     SubmitRecordMapper submitRecordMapper;
 
+    @Autowired
+    ModelItemMapper modelItemMapper;
+
     @Override
     public void saveModelItem(JSONObject jsonObject, AgencyUserModel userInfo) {
         long start = System.currentTimeMillis();
@@ -160,5 +163,4 @@ public class ModelItemServiceImpl extends ServiceImpl<ModelItemMapper, ModelItem
             checkResultMapper.delete(resultWrapper);
         }
     }
-
 }