Merge branch 'develop_dl_plan6' into develop_dl_plan6_temp

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

@@ -33,7 +33,8 @@
 			ala.location AS alarmPlace,
 			ala.create_date as create_date,
 			ala.location as location,
-			if(spe.code is null,ala.equipment_specific_name,concat(ala.equipment_specific_name,'(',spe.code,')')) as equipmentName,
+ 			-- if(spe.code is null,ala.equipment_specific_name,concat(ala.equipment_specific_name,'(',spe.code,')')) as equipmentName,
+			ala.equipment_specific_name as equipmentName,
 			(select
 			group_concat(fet.`name`)
 			from f_equipment_fire_equipment as fefe

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

@@ -17,7 +17,7 @@ public interface CheckResultMapper extends BaseMapper<CheckResult> {
 
     IPage<CheckResultDto> selectResult(IPage<CheckResultDto> page,String code);
 
-    Map<String, Object> selectTotal(String modelId, String batchNo);
+    Map<String, Object> selectTotal(String batchNo);
 
     Map<String, Object> getTables(String tableName, String amosOrgCode);
 

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

@@ -8,6 +8,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author xxz
@@ -25,6 +26,7 @@ public interface CheckModelService extends IService<CheckModel> {
 
     List<CheckModel> selectByOrgCode(String amosOrgCode);
 
+
     /**
      * 查询最后一次校验模型
      * @return 模型obj
@@ -50,4 +52,8 @@ public interface CheckModelService extends IService<CheckModel> {
      * @return 模型对象
      */
     CheckModel selectCheckModelByNameCode(String modelName, String amosOrgCode);
+
+    String getOrgCode(String companyName);
+
+
 }

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

@@ -18,9 +18,9 @@ public interface CheckResultService extends IService<CheckResult> {
 
     IPage<CheckResultDto> selectResult(int current,int size,String code);
 
-    List<CheckResult> selectCheckResult(String modelId,String batchNo);
+    List<CheckResult> selectCheckResult(String batchNo);
 
-    Map<String, Object> selectTotal(String modelId, String batchNo);
+    Map<String, Object> selectTotal(String batchNo);
 
     List<CheckResultDto> selectStatistion(String batchNo,String amosOrgCode);
 

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

@@ -9,12 +9,12 @@
                 and amos_org_code=#{code}
              </if>
          </where>
-        GROUP BY batch_no
+        GROUP BY batch_no ORDER BY check_date DESC
     </select>
 
     <select id="selectTotal" resultType="java.util.Map">
         SELECT count(1) as total, COUNT(CASE WHEN (check_item_result=1) THEN check_item_result END) AS unqualified
-        FROM tdc_check_result WHERE model_id = #{modelId} and batch_no = #{batchNo}
+        FROM tdc_check_result WHERE batch_no = #{batchNo}
     </select>
 
 

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

@@ -71,4 +71,12 @@ public class CheckModelController extends BaseController {
         AgencyUserModel userInfo = getUserInfo();
         checkModelService.checkSingleMode(modelId, userInfo);
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "/companyTree")
+    @ApiOperation(httpMethod = "GET",value = "下拉框选项",  notes = "下拉框选项")
+    public ResponseModel<String> getOrgCode(String companyName){
+
+        return ResponseHelper.buildResponse(checkModelService.getOrgCode(companyName));
+    }
 }

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

@@ -54,15 +54,17 @@ public class CheckResultController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @GetMapping(value = "/selectCheckResult")
     @ApiOperation(httpMethod = "GET",value = "查询最后一次校验模型",  notes = "查询最后一次校验模型")
-    public ResponseModel<List<CheckResult>> selectCheckResult(String modelId, String batchNo) {
-        return ResponseHelper.buildResponse(checkResultService.selectCheckResult(modelId,batchNo));
+    public ResponseModel<List<CheckResult>> selectCheckResult( String batchNo) {
+        return ResponseHelper.buildResponse(checkResultService.selectCheckResult(batchNo));
     }
 
+
+
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @GetMapping(value = "/selectTotal")
     @ApiOperation(httpMethod = "GET", value = "result", notes = "result")
-    public ResponseModel<Map<String, Object>> selectTotal(String modelId, String batchNo) {
-        return ResponseHelper.buildResponse(checkResultService.selectTotal(modelId, batchNo));
+    public ResponseModel<Map<String, Object>> selectTotal(String batchNo) {
+        return ResponseHelper.buildResponse(checkResultService.selectTotal(batchNo));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)

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

@@ -10,8 +10,6 @@ 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.CheckModelDto;
 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.feign.IdxFeignService;
 import com.yeejoin.amos.boot.module.tdc.api.mapper.CheckModelMapper;
 import com.yeejoin.amos.boot.module.tdc.api.mapper.CheckResultMapper;
@@ -20,7 +18,9 @@ import com.yeejoin.amos.boot.module.tdc.api.vo.SubjectTreeVo;
 import com.yeejoin.amos.boot.module.tdc.api.vo.TableColumnsVo;
 import com.yeejoin.amos.boot.module.tdc.biz.action.model.IdxProjectModel;
 import com.yeejoin.amos.component.rule.RuleTrigger;
+import com.yeejoin.amos.feign.privilege.Privilege;
 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;
 
@@ -80,6 +80,7 @@ public class CheckModelImpl extends ServiceImpl<CheckModelMapper, CheckModel> im
         return baseMapper.selectOne(wrapper);
     }
 
+
     @Override
     public void checkAllMode(String amosOrgCode, AgencyUserModel userInfo) {
         String userName = userInfo.getUserName();
@@ -155,5 +156,15 @@ public class CheckModelImpl extends ServiceImpl<CheckModelMapper, CheckModel> im
             e.printStackTrace();
         }
     }
+
+
+    @Override
+    public String getOrgCode(String companyName) {
+        Collection<CompanyModel> companyModelCollection = Privilege.companyClient.queryAgencyTree(companyName).getResult();
+        Iterator<CompanyModel> iterator = companyModelCollection.iterator();
+        CompanyModel companyModel = iterator.next();
+        return companyModel.getOrgCode();
+
+    }
 }
 

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

@@ -54,11 +54,27 @@ public class CheckReportImpl extends ServiceImpl<CheckReportMapper, CheckReport>
             JSONObject jsonObject = jsonArray.getJSONObject(i);
             String status = jsonObject.getString("status");
             jsonObject.put("state",ReportStateEnum.map.get(status));
+//            if("0".equals(status)){
+//                jsonObject.put("state","待填报");
+//            }
+//            if("1".equals(status)){
+//                jsonObject.put("state","待处理");
+//            }
+//            if("2".equals(status)){
+//                jsonObject.put("state","已处理");
+//            }
+//            if("3".equals(status)){
+//                jsonObject.put("state","我发起");
+//            }
+//            if("4".equals(status)){
+//                jsonObject.put("state","进行中");
+//            }
 
-        map.put("current",object.getString("pageNumber"));
-        map.put("records",jsonArray);
-        map.put("total",object.getString("total"));
-        return map;
+        }
+            map.put("current",object.getString("pageNumber"));
+            map.put("records",jsonArray);
+            map.put("total",object.getString("total"));
+            return map;
 
     }
 

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

@@ -71,23 +71,23 @@ public class CheckResultImpl extends ServiceImpl<CheckResultMapper, CheckResult>
         Page page = new Page(current,size);
         return checkResultMapper.selectResult(page,code);
 
-//        return checkResultMapper.selectResult(page,code);
     }
 
 
     @Override
-    public List<CheckResult> selectCheckResult(String modelId,String batchNo) {
+    public List<CheckResult> selectCheckResult(String batchNo) {
         LambdaQueryWrapper<CheckResult> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CheckResult::getCheckItemResult, "1")
-                .eq(CheckResult::getBatchNo, batchNo)
-                .eq(CheckResult::getModelId, modelId);
+                .isNotNull(CheckResult::getBatchNo)
+                .eq(CheckResult::getBatchNo,batchNo);
         return baseMapper.selectList(wrapper);
     }
 
     @Override
-    public Map<String, Object> selectTotal(String modelId, String batchNo) {
-        return checkResultMapper.selectTotal(modelId, batchNo);
+    public Map<String, Object> selectTotal(String batchNo) {
+        return checkResultMapper.selectTotal(batchNo);
     }
+
     @Override
     public List<CheckResultDto> selectStatistion(String batchNo, String amosOrgCode) {
         return checkResultMapper.selectStatistion(batchNo, amosOrgCode);