执法动态管理-点位详情查询调整

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BscLawTrendController.java

@@ -45,8 +45,9 @@ public class BscLawTrendController {
      * @return
      */
     @GetMapping("companyData")
-    public ApiResult<List<Map<String, Object>>> companyData(@RequestParam(value = "companyId") String companyId) {
-        return ApiResult.success(bscLawTrendService.companyData(companyId));
+    public ApiResult<List<Map<String, Object>>> companyData(@RequestParam(value = "companyId") String companyId,
+                                                            @RequestParam(value = "companyName") String companyName) {
+        return ApiResult.success(bscLawTrendService.companyData(companyId, companyName));
     }
 
     @GetMapping("monthLaw")

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DemEnforceInspectRecord.java

@@ -372,5 +372,10 @@ public class DemEnforceInspectRecord implements Serializable {
      */
     private String unionKey;
 
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
 
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/BscLawTrendService.java

@@ -35,7 +35,7 @@ public interface BscLawTrendService extends CrudService<BscLawTrend> {
      * @param companyId 单位ID
      * @return
      */
-    List<Map<String, Object>> companyData(String companyId);
+    List<Map<String, Object>> companyData(String companyId ,String companyName);
 
     /**
      * 消防执法动态-定时任务逻辑

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BscLawTrendServiceImpl.java

@@ -70,6 +70,9 @@ public class BscLawTrendServiceImpl extends AbstractCrudService<BscLawTrendMappe
     @Autowired
     private DemEnforceProjectAllService demEnforceProjectAllService;
 
+    @Autowired
+    private DemEnforceInspectRecordService demEnforceInspectRecordService;
+
     @Override
     public Object lawTrendList(String moduleType) {
         LambdaQueryWrapper<BscLawTrend> queryWrapper = Wrappers.lambdaQuery();
@@ -132,12 +135,13 @@ public class BscLawTrendServiceImpl extends AbstractCrudService<BscLawTrendMappe
     }
 
     @Override
-    public List<Map<String, Object>> companyData(String companyId) {
+    public List<Map<String, Object>> companyData(String companyId, String companyName) {
         List<Map<String, Object>> list3 = new ArrayList<>();
         LambdaQueryWrapper<BaseCompany> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(BaseCompany::getId, BaseCompany::getCompanyName, BaseCompany::getCompanyId, BaseCompany::getCompanyCode,
                 BaseCompany::getAddress, BaseCompany::getLinkPerson, BaseCompany::getLinkPhone)
-                .eq(BaseCompany::getCompanyId, companyId).eq(BaseCompany::getEnable, 0);
+                .eq(BaseCompany::getCompanyId, companyId)
+                .eq(BaseCompany::getEnable, 0);
         List<BaseCompany> companylist = baseCompanyService.list(queryWrapper);
         if (CollectionUtils.isNotEmpty(companylist)) {
             LambdaQueryWrapper<DemLawStatistics> queryWrapper1 = Wrappers.lambdaQuery();
@@ -149,6 +153,14 @@ public class BscLawTrendServiceImpl extends AbstractCrudService<BscLawTrendMappe
             queryWrapper2.eq(DemFireStatistics::getCompanyCode, companylist.get(0).getCompanyCode());
             int count1 = demFireStatisticsService.count(queryWrapper2);
 
+            LambdaQueryWrapper<DemEnforceInspectRecord> queryWrapper5 = Wrappers.lambdaQuery();
+            queryWrapper5.select(DemEnforceInspectRecord::getEnforceInspectPerson, DemEnforceInspectRecord::getInspectDescript,
+                    DemEnforceInspectRecord::getInspectQualified,DemEnforceInspectRecord::getCreateTime)
+                    .eq(DemEnforceInspectRecord::getCompanyName, companyName)
+                    .orderByDesc(DemEnforceInspectRecord::getId)
+                    .last(" limit 1");
+            List<DemEnforceInspectRecord> list4 = demEnforceInspectRecordService.list(queryWrapper5);
+
             LambdaQueryWrapper<DemFireStatistics> queryWrapper3 = Wrappers.lambdaQuery();
             queryWrapper3.select(DemFireStatistics::getFireTime, DemFireStatistics::getBurnedArea, DemFireStatistics::getFireGrade,
                     DemFireStatistics::getFireNumber)
@@ -172,6 +184,28 @@ public class BscLawTrendServiceImpl extends AbstractCrudService<BscLawTrendMappe
                     .eq("delete_flag", 0).eq("company_code", companylist.get(0).getCompanyCode());
             List<Map<String, Object>> list = demLawStatisticsService.listMaps(query);
             Map<String, Object> map = new HashMap<>();
+            String sponsor = null;
+            String coOrganizer = null;
+            String enforceInspectPerson = null;
+            String inspectDescript = null;
+            int inspectQualified = 0;
+            LocalDateTime createTime = null;
+            if (CollectionUtils.isNotEmpty(list4)) {
+                enforceInspectPerson = list4.get(0).getEnforceInspectPerson();
+                inspectDescript = list4.get(0).getInspectDescript();
+                inspectQualified = list4.get(0).getInspectQualified();
+                createTime = list4.get(0).getCreateTime();
+                if (StringUtils.isNotBlank(enforceInspectPerson)) {
+                    sponsor = enforceInspectPerson.split("、")[0];
+                    coOrganizer = enforceInspectPerson.split("、")[1];
+                }
+            }
+            map.put("enforceInspectPerson", enforceInspectPerson);
+            map.put("sponsor", sponsor);
+            map.put("coOrganizer", coOrganizer);
+            map.put("inspectDescript", inspectDescript);
+            map.put("inspectQualified", inspectQualified);
+            map.put("createTime", createTime);
             map.put("companyAddress", companylist.get(0).getAddress());
             map.put("linkPerson", companylist.get(0).getLinkPerson());
             map.put("linkPhone", companylist.get(0).getLinkPhone());
@@ -401,7 +435,7 @@ public class BscLawTrendServiceImpl extends AbstractCrudService<BscLawTrendMappe
         reportStatisticsVo.setConcludeNumber(fireCount + concludeCount);
         reportStatisticsVo.setCheckNumber(count - fireCount - concludeCount);
         Integer satisfactionRateNumber = demEnforceReportAttachService.enforceReportAttachCount(null, "3");
-        reportStatisticsVo.setSatisfactionRate(Arith.div(satisfactionRateNumber, count,2));
+        reportStatisticsVo.setSatisfactionRate(Arith.div(satisfactionRateNumber, count, 2));
         return reportStatisticsVo;
     }
 

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemEnforceInspectRecordMapper.xml

@@ -74,6 +74,7 @@
         <result column="law_id" property="lawId" />
         <result column="bdp_audit" property="bdpAudit" />
         <result column="union_key" property="unionKey" />
+        <result column="create_time" property="createTime" />
     </resultMap>
 
 </mapper>