Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
9258989d 由 张雷
选项

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

2 个父辈 2893331e 18632013
内嵌 并排
正在显示 10 个修改的文件 包含 241 行增加 和 42 行删除
sk-module-biz/src/main/java/com/skua/modules/erp/controller/MaterialINController.java
...@@ -342,6 +342,23 @@ public class MaterialINController { ...@@ -342,6 +342,23 @@ public class MaterialINController {
342 } 342 }
343 return result; 343 return result;
344 } 344 }
345
346 @AutoLog(value = "erp--erp采购合同-批量审批")
347 @ApiOperation(value="erp--采购合同-批量审批", notes="erp--采购合同-批量审批")
348 @GetMapping(value = "/auditBatch")
349 public Result<String> auditBatchMaterialINVO(@RequestParam(name="ids",required=true) String ids,String approveState,String approveMessage) {
350 Result<String> result = new Result<String>();
351 String errMsg = null;
352 try {
353 errMsg = materialINService.auditBatchMaterialINVO(ids,approveState,approveMessage);
354 //result.setResult(materialINVO);
355 result.setSuccess(true);
356 } catch (Exception e) {
357 log.error("审批失败",errMsg);
358 result.error500("审批失败:"+ errMsg);
359 }
360 return result;
361 }
345 /** 362 /**
346 * <pre> 363 * <pre>
347 * 导出excel 364 * 导出excel
......
sk-module-biz/src/main/java/com/skua/modules/erp/entity/MaterialIN.java
...@@ -92,6 +92,12 @@ public class MaterialIN { ...@@ -92,6 +92,12 @@ public class MaterialIN {
92 @ApiModelProperty(value = "数量") 92 @ApiModelProperty(value = "数量")
93 private String purchaseNum; 93 private String purchaseNum;
94 94
95 @Excel(name = "入库仓库", width = 15)
96 @ApiModelProperty(value = "入库仓库")
97 @Dict(dictTable = "supplies_warehouse", dicCode="id", dicText = "warehouse_name")
98 private String inWarehouseId;
99
100
95 /**供应商编号*/ 101 /**供应商编号*/
96 @Excel(name = "供应商编号", width = 15) 102 @Excel(name = "供应商编号", width = 15)
97 @ApiModelProperty(value = "供应商编号") 103 @ApiModelProperty(value = "供应商编号")
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/IMaterialINService.java
...@@ -51,4 +51,10 @@ public interface IMaterialINService extends IService<MaterialIN> { ...@@ -51,4 +51,10 @@ public interface IMaterialINService extends IService<MaterialIN> {
51 * @return 51 * @return
52 */ 52 */
53 MaterialIN queryById(String id); 53 MaterialIN queryById(String id);
54
55 /***
56 * 批量审批
57 * @param ids
58 */
59 String auditBatchMaterialINVO(String ids , String approveState,String approveMessage)throws Exception;
54 } 60 }
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/MaterialINServiceImpl.java
...@@ -67,6 +67,25 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia ...@@ -67,6 +67,25 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
67 @Autowired 67 @Autowired
68 private ICommonSqlService commonSqlService; 68 private ICommonSqlService commonSqlService;
69 69
70
71 /***
72 * 批量审批
73 * @param ids
74 */
75 @Transactional
76 public String auditBatchMaterialINVO(String ids , String approveState,String approveMessage)throws Exception{
77 String[] idsList = ids.split(",");
78 StringBuffer sb = new StringBuffer();
79 for(String id : idsList){
80 if(StringUtils.isNotEmpty(id)) {
81 String errMsg = auditMaterialIn(id, approveState, approveMessage);
82 if (StringUtils.isNotEmpty(errMsg)) {
83 sb.append(errMsg);
84 }
85 }
86 }
87 return sb.toString();
88 }
70 /*** 89 /***
71 * 审核药剂入库单 90 * 审核药剂入库单
72 * @param materialINVO 91 * @param materialINVO
...@@ -74,46 +93,54 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia ...@@ -74,46 +93,54 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
74 @Transactional 93 @Transactional
75 public String auditMaterialINVO(MaterialINVO materialINVO)throws Exception { 94 public String auditMaterialINVO(MaterialINVO materialINVO)throws Exception {
76 boolean inAndOutStock = false; 95 boolean inAndOutStock = false;
77 String errMsg = null; 96 String errMsg = auditMaterialIn(materialINVO.getId(),materialINVO.getApproveState(),materialINVO.getApproveMessage());
97 return errMsg;
98 }
78 99
100 @Transactional
101 public String auditMaterialIn(String id , String approveState,String approveMessage) throws Exception{
102 String errMsg = null;
103 boolean inAndOutStock = false;
79 //保存 104 //保存
80 MaterialIN materialINTemp = this.baseMapper.selectById(materialINVO.getId()); 105 MaterialIN materialINTemp = this.baseMapper.selectById(id);
81 /* QueryWrapper<SuppliesWarehouse> queryWrapper = new QueryWrapper<SuppliesWarehouse>(); 106 if(!"3".equals(materialINTemp.getAuditStatus())){
107 /* QueryWrapper<SuppliesWarehouse> queryWrapper = new QueryWrapper<SuppliesWarehouse>();
82 queryWrapper.eq("depart_id",materialINVO.getDepartId());*/ 108 queryWrapper.eq("depart_id",materialINVO.getDepartId());*/
83 String inWarehouseId = null; 109 String inWarehouseId = materialINTemp.getInWarehouseId();
84 //主库数据源 110 if(StringUtils.isEmpty(inWarehouseId)){
85 JdbcTemplate masterDB = (JdbcTemplate) SpringContextUtils.getBean("master"); 111 //主库数据源
86 if(materialINTemp != null && StringUtils.isNotEmpty(materialINTemp.getDepartId())){ 112 JdbcTemplate masterDB = (JdbcTemplate) SpringContextUtils.getBean("master");
87 String warehouseSql = "select id from supplies_warehouse where depart_id = '"+materialINTemp.getDepartId()+"' order by create_time desc limit 1"; 113 if(materialINTemp != null && StringUtils.isNotEmpty(materialINTemp.getDepartId())){
88 inWarehouseId = masterDB.queryForObject( warehouseSql,String.class ); 114 String warehouseSql = "select id from supplies_warehouse where depart_id = '"+materialINTemp.getDepartId()+"' order by create_time desc limit 1";
89 } 115 inWarehouseId = masterDB.queryForObject( warehouseSql,String.class );
90 if(StringUtils.isEmpty(inWarehouseId)){ 116 }
91 String departSql = "select depart_name from sys_depart where id = '"+materialINTemp.getDepartId()+"'"; 117 if(StringUtils.isEmpty(inWarehouseId)){
92 String departName = masterDB.queryForObject( departSql,String.class ); 118 String departSql = "select depart_name from sys_depart where id = '"+materialINTemp.getDepartId()+"'";
93 return "所属厂站["+ ConvertUtils.getString(departName) +"]下没有找到仓库信息！"; 119 String departName = masterDB.queryForObject( departSql,String.class );
94 } 120 return "所属厂站["+ ConvertUtils.getString(departName) +"]下没有找到仓库信息！";
95 121 }
96 //purchasePlan.getApproveState() 审批状态 1通过2不通过 122 }
97 if("1".equals( materialINVO.getApproveState() )){ 123 //purchasePlan.getApproveState() 审批状态 1通过2不通过
98 materialINTemp.setAuditStatus( "3" ); 124 if("1".equals( approveState )){
99 inAndOutStock = true; 125 materialINTemp.setAuditStatus( "3" );
100 } 126 inAndOutStock = true;
101 if("2".equals( materialINVO.getApproveState() )){ 127 }
102 materialINTemp.setAuditStatus( "2" ); 128 if("2".equals( approveState )){
103 } 129 materialINTemp.setAuditStatus( "2" );
104 // 审核通过，生成入库单据、物料单 130 }
105 if(inAndOutStock ){ 131 // 审核通过，生成入库单据、物料单
106 //出库 132 if(inAndOutStock ){
107 errMsg = syncEquipmentOut(materialINTemp); 133 //出库
108 //入库 134 errMsg = syncEquipmentOut(materialINTemp);
109 errMsg = syncEquipmentIn(materialINTemp,inWarehouseId); 135 //入库
136 errMsg = syncEquipmentIn(materialINTemp,inWarehouseId);
137 }
138 materialINTemp.setApproveMessage(approveMessage);//审批意见
139 this.baseMapper.updateById( materialINTemp ) ;
140 //审批记录
141 ApproveRecord record = new ApproveRecord( "YJIN", materialINTemp.getApplyUser(), materialINTemp.getId(), BaseContextHandler.getUserId(), approveMessage, approveState);
142 recordMapper.insert( record ) ;
110 } 143 }
111 materialINTemp.setApproveMessage(materialINVO.getApproveMessage());//审批意见
112 this.baseMapper.updateById( materialINTemp ) ;
113 //审批记录
114 ApproveRecord record = new ApproveRecord( "YJIN", materialINVO.getApplyUser(), materialINVO.getId(), BaseContextHandler.getUserId(), materialINVO.getApproveMessage(), materialINVO.getApproveState());
115 recordMapper.insert( record ) ;
116
117 return errMsg; 144 return errMsg;
118 } 145 }
119 146
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/controller/web/InspectionAnalysisController.java
1 package com.skua.modules.inspection.controller.web; 1 package com.skua.modules.inspection.controller.web;
2 2
3 import com.skua.core.api.vo.Result; 3 import com.skua.core.api.vo.Result;
4 import com.skua.core.context.BaseContextHandler;
4 import com.skua.modules.inspection.service.IInspectionAnalysisService; 5 import com.skua.modules.inspection.service.IInspectionAnalysisService;
5 import com.skua.modules.inspection.vo.*; 6 import com.skua.modules.inspection.vo.*;
7 import com.skua.tool.util.JSUtils;
6 import io.swagger.annotations.Api; 8 import io.swagger.annotations.Api;
7 import io.swagger.annotations.ApiOperation; 9 import io.swagger.annotations.ApiOperation;
8 import lombok.extern.slf4j.Slf4j; 10 import lombok.extern.slf4j.Slf4j;
11 import org.apache.commons.lang3.StringUtils;
9 import org.springframework.beans.factory.annotation.Autowired; 12 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.web.bind.annotation.GetMapping; 13 import org.springframework.web.bind.annotation.GetMapping;
11 import org.springframework.web.bind.annotation.RequestMapping; 14 import org.springframework.web.bind.annotation.RequestMapping;
...@@ -126,6 +129,19 @@ public class InspectionAnalysisController { ...@@ -126,6 +129,19 @@ public class InspectionAnalysisController {
126 return result; 129 return result;
127 } 130 }
128 131
132 @ApiOperation(value = "巡检分析-巡检任务异常项趋势-详情", notes = "巡检分析-巡检任务异常项趋势-详情")
133 @GetMapping("/getInspectionAbnormalItemsTrendDetail")
134 public Result<List<InspectionAbnormalItemsTrendVO> > getInspectionAbnormalItemsTrendDetail(String departId , String startDate, String endDate){
135 Result<List<InspectionAbnormalItemsTrendVO> > result = new Result<>();
136 if(StringUtils.isEmpty(departId)){
137 departId = BaseContextHandler.getDeparts();
138 }
139 List<InspectionAbnormalItemsTrendVO> inspectionAbnormalItemsTrendVOList = inspectionAnalysisService.getInspectionAbnormalItemsTrendDetail(JSUtils.quoteEach(departId,","),startDate,endDate);
140 result.setSuccess(true);
141 result.setResult(inspectionAbnormalItemsTrendVOList);
142 return result;
143 }
144
129 /** 145 /**
130 * <pre> 146 * <pre>
131 * 巡检分析-巡检任务指标 147 * 巡检分析-巡检任务指标
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/mapper/InspectionAnalysisMapper.java 0 → 100644
1 package com.skua.modules.inspection.mapper;
2
3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 import com.skua.modules.inspection.entity.InspectionFillChoice;
5 import com.skua.modules.inspection.vo.InspectionAbnormalItemsTrendVO;
6 import org.apache.ibatis.annotations.Param;
7
8 import java.util.List;
9
10 /**
11 *
12 * @auther kangwei
13 * @create 2025-01-17-11:01
14 */
15 public interface InspectionAnalysisMapper {
16 /***
17 * 巡检分析-巡检任务异常项趋势-详情
18 * @param departIds
19 * @param startDate
20 * @param endDate
21 * @return
22 */
23 public List<InspectionAbnormalItemsTrendVO> getInspectionAbnormalItemsTrendDetail(@Param("departIds") String departIds,@Param("startDate") String startDate, @Param("endDate") String endDate);
24 }
25
sk-module-inspection/src/main/java/com/skua/modules/inspection/mapper/xml/InspectionAnalysisMapper.xml 0 → 100644
1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 <mapper namespace="com.skua.modules.inspection.mapper.InspectionAnalysisMapper">
4
5
6
7 <!-- 巡检分析-巡检任务异常项趋势-详情 -->
8 <select id="getInspectionAbnormalItemsTrendDetail" resultType="com.skua.modules.inspection.vo.InspectionAbnormalItemsTrendVO">
9 select d.depart_name ,ifnull(ddd.total_count,0) 'total_count' , (ifnull(ddd.total_count,0) -ifnull(ddd.checked_count,0)) 'not_checked_items_Count' , ifnull(ddd.checked_count,0) 'checked_items_count',ifnull(ddd.abnormal_checked_count ,0)'abnormal_item_count'
10 from sys_depart d
11 left join(
12 select t.depart_id , sum(ifnull(aaa.total_count,0)) 'total_count' ,sum(ifnull(bbb.checked_count,0)) 'checked_count',sum(ifnull(ccc.abnormal_checked_count ,0))'abnormal_checked_count'
13 FROM inspection_task t
14 left join (
15 SELECT inspection_task_id , ifnull(count(inspection_task_id),0) total_count FROM inspection_task_fill_group_fill GROUP BY inspection_task_id
16 )aaa on aaa.inspection_task_id = t.id
17 left join (
18 SELECT inspection_task_id , ifnull(count(inspection_task_id),0) checked_count FROM inspection_task_fill_content WHERE fill_content IS NOT NULL AND fill_content &lt;&gt; '' GROUP BY inspection_task_id
19 )bbb on bbb.inspection_task_id = t.id
20 left join(
21 SELECT inspection_task_id , ifnull(count(inspection_task_id),0) abnormal_checked_count FROM inspection_task_fill_content WHERE fill_content IS NOT NULL AND fill_content &lt;&gt; '' AND choice_state = '0' GROUP BY inspection_task_id
22 )ccc on ccc.inspection_task_id = t.id
23 WHERE t.task_state IN ('2','3')
24 <if test="startDate != null ">
25 AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &gt;= #{startDate}
26 </if>
27 <if test="endDate != null ">
28 AND DATE_FORMAT(t.inspection_cycle_start_date,'%Y-%m-%d') &lt;= #{endDate}
29 </if>
30 group by t.depart_id
31 )ddd on d.id = ddd.depart_id
32
33 where d.depart_type = 1
34 <if test="departIds != null ">
35 and d.id in(${departIds})
36 </if>
37 order by ddd.total_count desc
38 </select>
39
40 </mapper>
sk-module-inspection/src/main/java/com/skua/modules/inspection/service/IInspectionAnalysisService.java
...@@ -15,11 +15,38 @@ public interface IInspectionAnalysisService { ...@@ -15,11 +15,38 @@ public interface IInspectionAnalysisService {
15 15
16 InspectionTaskIndicatorsVO getInspectionTaskIndicators(String startDate, String endDate); 16 InspectionTaskIndicatorsVO getInspectionTaskIndicators(String startDate, String endDate);
17 17
18 /***
19 * 巡检分析-巡检设备指标
20 * @param startDate
21 * @param endDate
22 * @return
23 */
18 InspectionEquipIndicatorsVO getInspectionEquipIndicators(String startDate, String endDate); 24 InspectionEquipIndicatorsVO getInspectionEquipIndicators(String startDate, String endDate);
19 25
20 InspectionTaskOverviewVO getInspectionTaskOverview(String startDate, String endDate); 26 InspectionTaskOverviewVO getInspectionTaskOverview(String startDate, String endDate);
21 27
28 /***
29 * 巡检分析-巡检设备概况
30 * @param startDate
31 * @param endDate
32 * @return
33 */
22 InspectionEquipOverviewVO getInspectionEquipOverview(String startDate, String endDate); 34 InspectionEquipOverviewVO getInspectionEquipOverview(String startDate, String endDate);
23 35
36 /***
37 * 巡检分析-巡检任务异常项趋势
38 * @param startDate
39 * @param endDate
40 * @return
41 */
24 List<InspectionAbnormalItemsTrendVO> getInspectionAbnormalItemsTrend(String startDate, String endDate); 42 List<InspectionAbnormalItemsTrendVO> getInspectionAbnormalItemsTrend(String startDate, String endDate);
43
44 /***
45 * 巡检分析-巡检任务异常项趋势-详情
46 * @param departIds
47 * @param startDate
48 * @param endDate
49 * @return
50 */
51 List<InspectionAbnormalItemsTrendVO> getInspectionAbnormalItemsTrendDetail(String departIds, String startDate, String endDate);
25 } 52 }
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/service/impl/InspectionAnalysisServiceImpl.java
...@@ -7,6 +7,7 @@ import com.skua.core.util.DateUtils; ...@@ -7,6 +7,7 @@ import com.skua.core.util.DateUtils;
7 import com.skua.modules.flow.business.service.FlowBusinessService; 7 import com.skua.modules.flow.business.service.FlowBusinessService;
8 import com.skua.modules.flow.engine.constant.FlowEngineConstant; 8 import com.skua.modules.flow.engine.constant.FlowEngineConstant;
9 import com.skua.modules.inspection.entity.*; 9 import com.skua.modules.inspection.entity.*;
10 import com.skua.modules.inspection.mapper.InspectionAnalysisMapper;
10 import com.skua.modules.inspection.service.*; 11 import com.skua.modules.inspection.service.*;
11 import com.skua.modules.inspection.vo.*; 12 import com.skua.modules.inspection.vo.*;
12 import com.skua.modules.system.entity.ProblemReportPlan; 13 import com.skua.modules.system.entity.ProblemReportPlan;
...@@ -49,10 +50,10 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService ...@@ -49,10 +50,10 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
49 @Autowired 50 @Autowired
50 private IInspectionTaskPointFillGroupService inspectionTaskPointFillGroupService; 51 private IInspectionTaskPointFillGroupService inspectionTaskPointFillGroupService;
51 @Autowired 52 @Autowired
52 private IInspectionTaskFillService inspectionTaskFillService;
53 @Autowired
54 private IInspectionTaskFillGroupFillService inspectionTaskFillGroupFillService; 53 private IInspectionTaskFillGroupFillService inspectionTaskFillGroupFillService;
55 54
55 @Autowired
56 private InspectionAnalysisMapper inspectionAnalysisMapper;
56 private static NumberFormat numberFormat; 57 private static NumberFormat numberFormat;
57 58
58 static { 59 static {
...@@ -469,6 +470,12 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService ...@@ -469,6 +470,12 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
469 return inspectionTaskIndicatorsVO; 470 return inspectionTaskIndicatorsVO;
470 } 471 }
471 472
473 /***
474 * 巡检分析-巡检设备指标
475 * @param startDate
476 * @param endDate
477 * @return
478 */
472 @Override 479 @Override
473 public InspectionEquipIndicatorsVO getInspectionEquipIndicators(String startDate, String endDate) { 480 public InspectionEquipIndicatorsVO getInspectionEquipIndicators(String startDate, String endDate) {
474 InspectionEquipIndicatorsVO inspectionEquipIndicatorsVO = new InspectionEquipIndicatorsVO(); 481 InspectionEquipIndicatorsVO inspectionEquipIndicatorsVO = new InspectionEquipIndicatorsVO();
...@@ -500,7 +507,7 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService ...@@ -500,7 +507,7 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
500 Integer totalInspectionEquipCount = equipInfoIdList.stream().map(m -> ConvertUtils.getString(m.get("equipInfoId"))).collect(Collectors.toSet()).size(); 507 Integer totalInspectionEquipCount = equipInfoIdList.stream().map(m -> ConvertUtils.getString(m.get("equipInfoId"))).collect(Collectors.toSet()).size();
501 //查询已巡检设备数量 508 //查询已巡检设备数量
502 List<String> inspectionPointFillGroupIdList = equipInfoIdList.stream().map(m -> ConvertUtils.getString(m.get("inspectionPointFillGroupId"))).collect(Collectors.toList()); 509 List<String> inspectionPointFillGroupIdList = equipInfoIdList.stream().map(m -> ConvertUtils.getString(m.get("inspectionPointFillGroupId"))).collect(Collectors.toList());
503 List<String> inspectionFillGroupIdList = equipInfoIdList.stream().map(m -> ConvertUtils.getString(m.get("inspectionFillGroupId"))).collect(Collectors.toList()); 510 List<String> inspectionFillGroupIdList = equipInfoIdList.stream().map(m -> ConvertUtils.getString(m.get("inspectionFillGroupId"))).collect(Collectors.toList());//构筑物
504 int checkedInspectionEquipCount = 0; 511 int checkedInspectionEquipCount = 0;
505 int notCheckedInspectionEquipCount = 0; 512 int notCheckedInspectionEquipCount = 0;
506 int abnormalInspectionEquipCount = 0; 513 int abnormalInspectionEquipCount = 0;
...@@ -692,6 +699,12 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService ...@@ -692,6 +699,12 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
692 return inspectionTaskOverviewVO; 699 return inspectionTaskOverviewVO;
693 } 700 }
694 701
702 /***
703 * 巡检分析-巡检设备概况
704 * @param startDate
705 * @param endDate
706 * @return
707 */
695 @Override 708 @Override
696 public InspectionEquipOverviewVO getInspectionEquipOverview(String startDate, String endDate) { 709 public InspectionEquipOverviewVO getInspectionEquipOverview(String startDate, String endDate) {
697 InspectionEquipOverviewVO inspectionEquipOverviewVO = new InspectionEquipOverviewVO(); 710 InspectionEquipOverviewVO inspectionEquipOverviewVO = new InspectionEquipOverviewVO();
...@@ -870,6 +883,17 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService ...@@ -870,6 +883,17 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
870 } 883 }
871 884
872 885
886
887 /***
888 * 巡检分析-巡检任务异常项趋势-详情
889 * @param departIds
890 * @param startDate
891 * @param endDate
892 * @return
893 */
894 public List<InspectionAbnormalItemsTrendVO> getInspectionAbnormalItemsTrendDetail(String departIds, String startDate, String endDate){
895 return inspectionAnalysisMapper.getInspectionAbnormalItemsTrendDetail( departIds, startDate, endDate);
896 }
873 public static List<String[]> getCycleList(int cycleNum, String startTime, String endTime) throws ParseException { 897 public static List<String[]> getCycleList(int cycleNum, String startTime, String endTime) throws ParseException {
874 // System.out.println("统计的时间段为：从" + startTime + "到" + endTime); 898 // System.out.println("统计的时间段为：从" + startTime + "到" + endTime);
875 Date endParse = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(endTime); 899 Date endParse = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(endTime);
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/vo/InspectionAbnormalItemsTrendVO.java
...@@ -17,10 +17,21 @@ import lombok.EqualsAndHashCode; ...@@ -17,10 +17,21 @@ import lombok.EqualsAndHashCode;
17 @EqualsAndHashCode(callSuper = false) 17 @EqualsAndHashCode(callSuper = false)
18 @ApiModel(value="巡检任务异常项趋势", description="巡检任务异常项趋势") 18 @ApiModel(value="巡检任务异常项趋势", description="巡检任务异常项趋势")
19 public class InspectionAbnormalItemsTrendVO { 19 public class InspectionAbnormalItemsTrendVO {
20 @ApiModelProperty(value = "未检项") 20
21
22 @ApiModelProperty(value = "厂站名称")
23 private String departName;
24
25 @ApiModelProperty(value = "总的填报项数量")
26 private Integer totalCount;
27 @ApiModelProperty(value = "填报项数量")
28 private Integer checkedItemsCount;
29
30
31 @ApiModelProperty(value = "日期")
21 private String inspectionTaskDate; 32 private String inspectionTaskDate;
22 @ApiModelProperty(value = "未检项") 33 @ApiModelProperty(value = "未检项数量")
23 private Integer notCheckedItemsCount; 34 private Integer notCheckedItemsCount;
24 @ApiModelProperty(value = "异常项") 35 @ApiModelProperty(value = "异常项数量")
25 private Integer abnormalItemsCount; 36 private Integer abnormalItemsCount;
26 } 37 }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!