完善水电生成报告详情数据 工作票 操作票

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/areamonthly/vo/StandardTicketWithAreaVo.java

@@ -29,7 +29,7 @@ public class StandardTicketWithAreaVo {
      * 月份
      */
     @ApiModelProperty("月份")
-    private YearMonth YearMonth;
+    private YearMonth yearMonth;
 
 
     /**

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/MiddleApplication.java

@@ -13,9 +13,15 @@ import org.springframework.context.annotation.ComponentScan;
 @MapperScan("com.hnac.hzims.*.**.mapper.**")
 @ComponentScan(basePackages = {"com.hnac.*"})
 public class MiddleApplication {
+    static {
+        System.setProperty("spring.cloud.nacos.discovery.server-addr", "http://175.6.40.67:10042");
+        System.setProperty("spring.cloud.nacos.config.server-addr", "http://175.6.40.67:10042");
+        System.setProperty("spring.cloud.nacos.username", "nacos");
+        System.setProperty("spring.cloud.nacos.password", "nacos");
+    }
 
-	public static void main(String[] args) {
+    public static void main(String[] args) {
-		BladeApplication.run("hzims-middle", MiddleApplication.class, args);
+        BladeApplication.run("hzims-middle", MiddleApplication.class, args);
-	}
+    }
 
 }

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/config/SysLogConfig.java

@@ -7,6 +7,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import java.util.Timer;
+import java.util.TimerTask;
 
 /**
  * @Author WL
@@ -28,7 +29,7 @@ public class SysLogConfig {
         SyslogTimerTask myTimeTask = new SyslogTimerTask(statisticsService);
         //3.通过timer定时定频率调用SyslogTimerTask的业务逻辑
         // 即 第一次执行是在当前时间的两秒之后，之后每隔60分钟执行一次
-        timer.schedule(myTimeTask,2000L,60000L);
+        timer.schedule(myTimeTask, 2000L, (60L  * 1000L));
     }
 
 }

hzims-service/hzims-middle/src/main/resources/application.yml

@@ -4,6 +4,8 @@ server:
 
 #数据源配置
 spring:
+  main:
+    allow-bean-definition-overriding: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure

hzims-service/hzims-middle/src/test/java/com/hnac/hzims/middle/MiddleApplicationTests.java

@@ -3,7 +3,7 @@ package com.hnac.hzims.middle;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest
+@SpringBootTest(classes = MiddleApplication.class)
 class MiddleApplicationTests {
 
 	@Test

hzims-service/operational/src/main/java/com/hnac/hzims/operational/OperationApplication.java

@@ -41,13 +41,12 @@ import javax.annotation.Resource;
 public class OperationApplication extends SpringBootServletInitializer {
 
 	static{
-		System.setProperty("--spring.cloud.nacos.discovery.server-addr", "http://175.6.40.67:10042");
+		System.setProperty("spring.cloud.nacos.discovery.server-addr", "http://175.6.40.67:10042");
-		System.setProperty("--spring.cloud.nacos.config.server-addr", "http://175.6.40.67:10042");
+		System.setProperty("spring.cloud.nacos.config.server-addr", "http://175.6.40.67:10042");
-		System.setProperty("--spring.cloud.nacos.username", "nacos");
+		System.setProperty("spring.cloud.nacos.username", "nacos");
-		System.setProperty("--spring.cloud.nacos.password", "nacos");
+		System.setProperty("spring.cloud.nacos.password", "nacos");
 	}
 
-
 	public static void main(String[] args) {
 		BladeApplication.run(OperationalConstants.APP_NAME, OperationApplication.class, args);
 	}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/web/AreaMonthlyDetailsController.java

@@ -73,7 +73,7 @@ public class AreaMonthlyDetailsController {
      *
      * @return
      */
-    @ApiOperation("操作票 根据月份，区域 获取操作详情数据")
+    @ApiOperation("操作票 根据月份，区域 获取操作详情分页列表数据")
     @GetMapping("/areaMonthlyWithOperation/{page}/{size}")
     public R areaMonthlyWithOperation(
             @ApiParam(name = "page", value = "当前页", required = true) @PathVariable("page") Long page,
@@ -118,9 +118,9 @@ public class AreaMonthlyDetailsController {
     }
 
     /**
-     * 根据月份和区域查询工作票列表详情
+     * 根据月份和区域查询工作票分页列表数据
      */
-    @ApiOperation("根据月份和区域查询工作票列表详情")
+    @ApiOperation("根据月份和区域查询工作票分页列表数据")
     @GetMapping("/workTicketListByMonthAndArea/{page}/{size}")
     R<BladePage<StandardWorkVo>> workTicketListByMonthAndArea(
             @ApiParam(name = "page", value = "当前页", required = true) @PathVariable("page") Long page,

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/StandardTicketInfoMapper.java

@@ -1,6 +1,9 @@
 package com.hnac.hzims.ticket.standardTicket.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity;
 import com.hnac.hzims.ticket.standardTicket.vo.OperateTicketStatisticVO;
 import com.hnac.hzims.vo.SafeCheckStatisticVO;
@@ -42,4 +45,14 @@ public interface StandardTicketInfoMapper extends UserDataScopeBaseMapper<Standa
 	List<OperateTicketStatisticVO> getOperateTicketReportStatistic(@Param("startDate") String startDate,
 																   @Param("endDate") String endDate,
 																   @Param("deptIdList") List<Long> deptIdList);
+
+
+	/**
+	 * 分页查询
+	 * @param searchPage
+	 * @param queryWrapper
+	 * @return
+	 */
+    Page<StandardTicketInfoEntity> selectPages(Page<StandardTicketInfoEntity> searchPage,
+											   @Param(Constants.WRAPPER) QueryWrapper<StandardTicketInfoEntity> queryWrapper);
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/xml/StandardTicketInfoMapper.xml

@@ -76,4 +76,10 @@
             </if>
         </where>
     </select>
+
+    <select id="selectPages" resultType="com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity">
+        select sti.* from hzims_standard_ticket_info sti left join
+                          hzims_ticket_info_evaluate tie on  sti.id = tie.ticket_id
+           ${ew.customSqlSegment}
+    </select>
 </mapper>

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java

@@ -331,23 +331,26 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl<StandardTicke
         //1.查询
         QueryWrapper<StandardTicketInfoEntity> queryWrapper = new QueryWrapper<>();
         //开票来源
-        queryWrapper.lambda().eq(Func.isNotEmpty(areaVo.getTaskType()), StandardTicketInfoEntity::getTaskType,
+        queryWrapper.eq(Func.isNotEmpty(areaVo.getTaskType()), "sti.task_type",
                 areaVo.getTaskType());
         //编号
-        queryWrapper.lambda().like(Func.isNotEmpty(areaVo.getCode()), StandardTicketInfoEntity::getCode, areaVo.getCode());
+        queryWrapper.like(Func.isNotEmpty(areaVo.getCode()),"sti.code" , areaVo.getCode());
         //状态
-        queryWrapper.lambda().eq(Func.isNotEmpty(areaVo.getStatus()), StandardTicketInfoEntity::getStatus,
+        queryWrapper.eq(Func.isNotEmpty(areaVo.getStatus()), "sti.status",
                 areaVo.getStatus());
         //开始时间
-        queryWrapper.lambda().lt(Func.isNotEmpty(areaVo.getStartTime()), StandardTicketInfoEntity::getCreateTime,
+        queryWrapper.lt(Func.isNotEmpty(areaVo.getStartTime()), "sti.create_time",
                 areaVo.getStartTime());
         //结束时间
-        queryWrapper.lambda().le(Func.isNotEmpty(areaVo.getEndTime()), StandardTicketInfoEntity::getCreateTime,
+        queryWrapper.le(Func.isNotEmpty(areaVo.getEndTime()), "sti.create_time",
                 areaVo.getEndTime());
-        queryWrapper.eq("CREATE_DEPT", areaVo.getAreaId());
+
+        queryWrapper.eq("sti.CREATE_DEPT", areaVo.getAreaId());
         queryWrapper.eq(areaVo.getYearMonth() != null,
-                "date_format(create_time,'%Y-%m')", areaVo.getYearMonth());
+                "date_format(sti.create_time,'%Y-%m')", areaVo.getYearMonth());
-        Page<StandardTicketInfoEntity> standardTicketInfoEntityPage = baseMapper.selectPage(searchPage, queryWrapper);
+        queryWrapper.eq("tie.status",1);
+        Page<StandardTicketInfoEntity> standardTicketInfoEntityPage = baseMapper.selectPages(searchPage, queryWrapper);
+
         //数据转换StandardTicketInfoEntity ==> StandardTicketVo
         List<StandardTicketVo> standardTicketInfoVOList = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(standardTicketInfoEntityPage.getRecords())) {
@@ -364,10 +367,11 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl<StandardTicke
                 standardTicketVo.setPrincipalName(Optional.ofNullable(principal).map(User::getName).orElse(null));
                 standardTicketVo.setGuardianName(Optional.ofNullable(guardian).map(User::getName).orElse(null));
                 /**来源类型名称**/
-                standardTicketVo.setTaskTypeName(Optional.ofNullable(item.getTaskType()).map(t-> DictCache.getValue(DictConstants.TICKET_SOURCE_TYPE,t)).orElse(null));
+                standardTicketVo.setTaskTypeName(Optional.ofNullable(item.getTaskType()).map(t -> DictCache.getValue(DictConstants.TICKET_SOURCE_TYPE, t)).orElse(null));
                 return standardTicketVo;
             }).collect(Collectors.toList());
         }
+
         Page<StandardTicketVo> page = new Page<>();
         page.setSize(standardTicketInfoEntityPage.getSize());
         page.setCurrent(standardTicketInfoEntityPage.getCurrent());
@@ -379,6 +383,21 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl<StandardTicke
         return bladePage;
     }
 
+
+    /**
+     * 判断是否存在合格率 如果存在返回true 否则为false
+     * @param item
+     * @return
+     */
+    private boolean isTicketPercentById(StandardTicketInfoEntity item) {
+        LambdaQueryWrapper<TicketInfoEvaluateEntity> ticketInfoEvaluateEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        ticketInfoEvaluateEntityLambdaQueryWrapper.eq(TicketInfoEvaluateEntity::getTicketId, item.getId());
+        ticketInfoEvaluateEntityLambdaQueryWrapper.eq(TicketInfoEvaluateEntity::getStatus,
+                TicketConstants.TicketQualifiedEnum.Qualified.getCode());
+        int count = ticketInfoEvaluateService.count(ticketInfoEvaluateEntityLambdaQueryWrapper);
+        return count > 0;
+    }
+
     /**
      * 首页-当月操作票获取
      *

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/WorkTicketInfoMapper.java

@@ -1,5 +1,8 @@
 package com.hnac.hzims.ticket.workTicket.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity;
 import com.hnac.hzims.ticket.workTicket.vo.WorkTicketReportStatisticVO;
 import com.hnac.hzims.vo.SafeCheckStatisticVO;
@@ -22,30 +25,43 @@ import java.util.Map;
 @Mapper
 public interface WorkTicketInfoMapper extends UserDataScopeBaseMapper<WorkTicketInfoEntity> {
 
-	int countByMap(Map<String, Object> map);
+    int countByMap(Map<String, Object> map);
-
+
-	int qualifiedCount(Integer type,int year,int month);
+    int qualifiedCount(Integer type, int year, int month);
-
+
-	/**
+    /**
-	 * 获取安全检查项工作票项统计
+     * 获取安全检查项工作票项统计
-	 * @param startDate 开始时间
+     *
-	 * @param endDate 结束时间
+     * @param startDate 开始时间
-	 * @param dept 机构
+     * @param endDate   结束时间
-	 * @return
+     * @param dept      机构
-	 */
+     * @return
-	SafeCheckStatisticVO getWorkTicketStatistic(@Param("startDate") String startDate,
+     */
-												@Param("endDate") String endDate,
+    SafeCheckStatisticVO getWorkTicketStatistic(@Param("startDate") String startDate,
-												@Param("dept") Long dept);
+                                                @Param("endDate") String endDate,
-
+                                                @Param("dept") Long dept);
-	/**
+
-	 * 获取站点统计报表 - 工作票
+    /**
-	 * @param startDate 开始时间
+     * 获取站点统计报表 - 工作票
-	 * @param endDate 结束时间
+     *
-	 * @param dept 机构ID
+     * @param startDate 开始时间
-	 * @return
+     * @param endDate   结束时间
-	 */
+     * @param dept      机构ID
-	@UserDataAuth
+     * @return
-	List<WorkTicketReportStatisticVO> getWorkTicketReportStatistic(@Param("startDate") String startDate,
+     */
-																   @Param("endDate") String endDate,
+    @UserDataAuth
-																   @Param("deptIdList") List<Long> dept);
+    List<WorkTicketReportStatisticVO> getWorkTicketReportStatistic(@Param("startDate") String startDate,
+                                                                   @Param("endDate") String endDate,
+                                                                   @Param("deptIdList") List<Long> dept);
+
+
+    /**
+     * 分页查询
+     *
+     * @param pageEntity
+     * @param queryWrapper
+     * @return
+     */
+    Page<WorkTicketInfoEntity> selectPages(Page<WorkTicketInfoEntity> pageEntity,
+                                           @Param(Constants.WRAPPER) QueryWrapper<WorkTicketInfoEntity> queryWrapper);
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/xml/WorkTicketInfoMapper.xml

@@ -79,4 +79,10 @@
         </where>
     </select>
 
+    <select id="selectPages" resultType="com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity">
+        select sti.* from hzims_work_ticket_info sti left join
+                          hzims_ticket_info_evaluate tie on  sti.id = tie.ticket_id
+            ${ew.customSqlSegment}
+    </select>
+
 </mapper>

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java

@@ -14,6 +14,8 @@ import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity;
 import com.hnac.hzims.operational.access.feign.IOperAccessTaskClient;
 import com.hnac.hzims.operational.maintenance.dto.OperMaintenanceTaskDTO;
 import com.hnac.hzims.operational.maintenance.feign.ITaskClient;
+import com.hnac.hzims.ticket.allTicket.entity.TicketInfoEvaluateEntity;
+import com.hnac.hzims.ticket.allTicket.service.TicketInfoEvaluateService;
 import com.hnac.hzims.ticket.areamonthly.vo.AreaMonthlyVo;
 import com.hnac.hzims.ticket.areamonthly.vo.StandardTicketWithAreaVo;
 import com.hnac.hzims.ticket.areamonthly.vo.StandardWorkVo;
@@ -93,6 +95,7 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
     private final WorkDelayNoScopeMapper workDelayNoScopeMapper;
     private final IOperAccessTaskClient operAccessTaskClient;
     private final ITaskClient taskClient;
+    private final TicketInfoEvaluateService ticketInfoEvaluateService;
 
     /** 生成两票编号锁 **/
     private Lock lock = new ReentrantLock();
@@ -877,28 +880,30 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
         QueryWrapper<WorkTicketInfoEntity> queryWrapper = new QueryWrapper<>();
 
         //开票来源
-        queryWrapper.lambda().eq(Func.isNotEmpty(areaVo.getTaskType()), WorkTicketInfoEntity::getTaskType,
+        queryWrapper.eq(Func.isNotEmpty(areaVo.getTaskType()), "sti.task_type",
                 areaVo.getTaskType());
         //编号
-        queryWrapper.lambda().like(Func.isNotEmpty(areaVo.getCode()), WorkTicketInfoEntity::getCode, areaVo.getCode());
+        queryWrapper.like(Func.isNotEmpty(areaVo.getCode()), "sti.code", areaVo.getCode());
 
         //状态
-        queryWrapper.lambda().eq(Func.isNotEmpty(areaVo.getStatus()), WorkTicketInfoEntity::getStatus,
+        queryWrapper.eq(Func.isNotEmpty(areaVo.getStatus()), "sti.status",
                 areaVo.getStatus());
 
         //开始时间
-        queryWrapper.lambda().lt(Func.isNotEmpty(areaVo.getStartTime()), WorkTicketInfoEntity::getCreateTime,
+        queryWrapper.lt(Func.isNotEmpty(areaVo.getStartTime()), "sti.create_time",
                 areaVo.getStartTime());
 
         //结束时间
-        queryWrapper.lambda().le(Func.isNotEmpty(areaVo.getEndTime()), WorkTicketInfoEntity::getCreateTime,
+        queryWrapper.le(Func.isNotEmpty(areaVo.getEndTime()), "sti.create_time",
                 areaVo.getEndTime());
 
 
-        queryWrapper.eq("create_dept", areaVo.getAreaId());
+        queryWrapper.eq("sti.create_dept", areaVo.getAreaId());
-        queryWrapper.eq(areaVo.getYearMonth() != null, "date_format(create_time,'%Y-%m')",
+        queryWrapper.eq(areaVo.getYearMonth() != null, "date_format(sti.create_time,'%Y-%m')",
                 areaVo.getYearMonth());
-        Page<WorkTicketInfoEntity> workTicketInfoEntityPage = baseMapper.selectPage(pageEntity, queryWrapper);
+        //如果为1为合格
+        queryWrapper.eq("tie.status",1);
+        Page<WorkTicketInfoEntity> workTicketInfoEntityPage = baseMapper.selectPages(pageEntity, queryWrapper);
         //数据转换
         List<StandardWorkVo> standardWorkList = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(workTicketInfoEntityPage.getRecords())) {
@@ -918,4 +923,21 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
         BladePage<StandardWorkVo> bladePage = BladePage.of(page);
         return bladePage;
     }
+
+
+    /**
+     * 判断是否存在合格率 如果存在返回true 否则为false
+     *
+     * @param item
+     * @return
+     */
+    private boolean isTicketPercentById(WorkTicketInfoEntity item) {
+        LambdaQueryWrapper<TicketInfoEvaluateEntity> ticketInfoEvaluateEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        ticketInfoEvaluateEntityLambdaQueryWrapper.eq(TicketInfoEvaluateEntity::getTicketId, item.getId());
+        ticketInfoEvaluateEntityLambdaQueryWrapper.eq(TicketInfoEvaluateEntity::getStatus,
+                TicketConstants.TicketQualifiedEnum.Qualified.getCode());
+        // 查询合格评价
+        int count = ticketInfoEvaluateService.count(ticketInfoEvaluateEntityLambdaQueryWrapper);
+        return count > 0;
+    }
 }