点检报表后端

qushaowei

2025-05-26 ed48aa9f30a87c528f071d06bf6b59d7d15428e9

点检报表后端

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java

@@ -712,11 +712,11 @@
         Equipment equipment = equipmentService.getOne(new LambdaQueryWrapper<Equipment>().eq(Equipment::getNum, equipmentNum).eq(Equipment::getDelFlag, 0));

         List<Map<String, Object>> list1 = this.getInspectionStandars(equipmentNum,"day",dataTime);
         List<Map<String, Object>> list2 = this.getUserQianzi(equipmentNum,"day");
         List<Map<String, Object>> list3 = this.getCheckUserQianzi(equipmentNum,"day");
         List<Map<String, Object>> list2 = this.getUserQianzi(equipmentNum,"day",dataTime);
         List<Map<String, Object>> list3 = this.getCheckUserQianzi(equipmentNum,"day",dataTime);
         List<Map<String, Object>> list4 = this.getInspectionStandars(equipmentNum, "week",dataTime);
         List<Map<String, Object>> list5 = this.getUserQianzi(equipmentNum,"week");
         List<Map<String, Object>> list6 = this.getCheckUserQianzi(equipmentNum,"week");
         List<Map<String, Object>> list5 = this.getUserQianzi(equipmentNum,"week",dataTime);
         List<Map<String, Object>> list6 = this.getCheckUserQianzi(equipmentNum,"week",dataTime);

         mapResult.put("equipentNum",equipment.getNum());
         mapResult.put("equipentName",equipment.getName());
@@ -787,10 +787,10 @@
         return maps;
     }

    List<Map<String, Object>> getUserQianzi(String num,String cycleUnit){
    List<Map<String, Object>> getUserQianzi(String equipmentNum,String cycleUnit,String dataTime){
        List<Map<String, Object>> maps2 = new ArrayList<>();
        List<InspectionResultVo> listIn = new ArrayList<>();
        List<Map<String, Object>> userQianZi = inspectionOrderService.getUserQianZi(num,cycleUnit);
        List<Map<String, Object>> userQianZi = inspectionOrderService.getUserQianZi(equipmentNum,cycleUnit,dataTime);
        for (Map<String, Object> map : userQianZi) {
            if(maps2.size()>0){
                Boolean flag = false;
@@ -834,10 +834,10 @@
        return maps2;
    }

     List<Map<String, Object>> getCheckUserQianzi(String num,String cycleUnit){
     List<Map<String, Object>> getCheckUserQianzi(String num,String cycleUnit,String dataTime){
         List<Map<String, Object>> maps3 = new ArrayList<>();
         List<InspectionResultVo> listRe = new ArrayList<>();
         List<Map<String, Object>> checkUserQianZi = inspectionOrderService.getUserQianZi(num,cycleUnit);
         List<Map<String, Object>> checkUserQianZi = inspectionOrderService.getUserQianZi(num,cycleUnit,dataTime);
         for (Map<String, Object> map : checkUserQianZi) {
             if(maps3.size()>0){
                 Boolean flag = false;

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/InspectionOrderMapper.java

@@ -53,5 +53,5 @@
    /**
     * 点检报表 new
     */
    List<Map<String, Object>> getUserQianzi(@Param("num")String num,@Param("cycleUnit")String cycleUnit);
    List<Map<String, Object>> getUserQianzi(@Param("equipmentNum")String equipmentNum,@Param("cycleUnit")String cycleUnit,@Param("dataTime")String dataTime);
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml

@@ -292,7 +292,14 @@
                LEFT JOIN mom_eam_inspection_project t3 ON t1.inspection_project_id = t3.id
                LEFT JOIN mom_eam_equipment t4 ON t2.equipment_id = t4.id
                left join mom_eam_inspection_cycle t5 on t1.inspection_cycle_id = t5.id
        WHERE t4.num = '0526'
        WHERE 1=1
        <if test="equipmentNum != null and equipmentNum != ''">
            and t4.num = #{equipmentNum}
        </if>
        <if test="equipmentNum == null and equipmentNum == ''">
            and t4.num = '-1'
        </if>

        AND t2.version_status = '2'
        and t5.cycle_unit = #{cycleUnit}
    </select>
@@ -315,7 +322,9 @@
           <if test="equipmentNum != null and equipmentNum != ''">
              and t4.num = #{equipmentNum}
           </if>
           <if test="equipmentNum == null and equipmentNum == ''"> and t4.num = '-1' </if>
           <if test="equipmentNum == null and equipmentNum == ''">
                and t4.num = '-1'
           </if>
           <if test="dataTime != null and dataTime != ''">
                AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), #{dataTime}, 120 ), 2, 7 )
           </if>
@@ -334,7 +343,19 @@
            mom_eam_inspection_order t1
        LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
        LEFT JOIN mom_eam_inspection_cycle t3 ON t1.inspection_cycle_id = t3.id
        WHERE 1=1 and
            t2.num = '0526' and t3.cycle_unit = #{cycleUnit}
        WHERE 1=1
        <if test="equipmentNum != null and equipmentNum != ''">
            and t2.num = #{equipmentNum}
        </if>
        <if test="equipmentNum == null and equipmentNum == ''">
            and t2.num = '-1'
        </if>
        <if test="dataTime != null and dataTime != ''">
            AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), #{dataTime}, 120 ), 2, 7 )
        </if>
        <if test="dataTime == null and dataTime == ''">
            AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 ), 1, 7 )
        </if>
          and t3.cycle_unit = #{cycleUnit}
    </select>
</mapper>

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IInspectionOrderService.java

@@ -49,7 +49,7 @@
     */
    List<Map<String, Object>> findDayInspectionStandardProject(String equipmentNum,String name,String detectionStandard,String dataTime);

    List<Map<String, Object>> getUserQianZi(String num,String cycleUnit);
    List<Map<String, Object>> getUserQianZi(String equipmentNum,String cycleUnit,String dataTime);




 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/InspectionOrderServiceImpl.java

@@ -111,7 +111,7 @@
    }

    @Override
    public List<Map<String, Object>> getUserQianZi(String num,String cycleUnit) {
        return this.baseMapper.getUserQianzi(num,cycleUnit);
    public List<Map<String, Object>> getUserQianZi(String equipmentNum,String cycleUnit,String dataTime) {
        return this.baseMapper.getUserQianzi(equipmentNum,cycleUnit,dataTime);
    }
}