diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java index 90272b4..4f5d319 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java @@ -56,7 +56,7 @@ /** * 文件新建、编辑（废止）、删除 * 流程：审批人列表要随着流程图信息一起上传 - * 前后端交互两种方案（待晓颖调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） + * 前后端交互两种方案（待前端调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） * 2、前端直接传bpmn文件或bpmn的xml文件（使用BpmnXMLConverter类的方法） * 文件的审批状态字段要更新，保证文件表的状态及时更新，供各列表使用 */ @@ -80,6 +80,12 @@ return meterFileService.updateFile(idDTO.getId()); } + /** + * 计量规程文件替换 + */ + // TODO: 2022/11/28 计量规程文件替换接口 + + @ApiOperation("文件删除") @PostMapping("/delete") @ResponseBody diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java index 90272b4..4f5d319 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java @@ -56,7 +56,7 @@ /** * 文件新建、编辑（废止）、删除 * 流程：审批人列表要随着流程图信息一起上传 - * 前后端交互两种方案（待晓颖调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） + * 前后端交互两种方案（待前端调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） * 2、前端直接传bpmn文件或bpmn的xml文件（使用BpmnXMLConverter类的方法） * 文件的审批状态字段要更新，保证文件表的状态及时更新，供各列表使用 */ @@ -80,6 +80,12 @@ return meterFileService.updateFile(idDTO.getId()); } + /** + * 计量规程文件替换 + */ + // TODO: 2022/11/28 计量规程文件替换接口 + + @ApiOperation("文件删除") @PostMapping("/delete") @ResponseBody diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml index 734f08e..706e7c8 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml @@ -54,7 +54,7 @@ mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department, mtsp.job, mtsp.phone FROM meter_trace_supplier mts - LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mts.supplier_id + LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mtsp.supplier_id WHERE mts.id = #{id} AND mts.is_del = 0 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java index 90272b4..4f5d319 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java @@ -56,7 +56,7 @@ /** * 文件新建、编辑（废止）、删除 * 流程：审批人列表要随着流程图信息一起上传 - * 前后端交互两种方案（待晓颖调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） + * 前后端交互两种方案（待前端调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） * 2、前端直接传bpmn文件或bpmn的xml文件（使用BpmnXMLConverter类的方法） * 文件的审批状态字段要更新，保证文件表的状态及时更新，供各列表使用 */ @@ -80,6 +80,12 @@ return meterFileService.updateFile(idDTO.getId()); } + /** + * 计量规程文件替换 + */ + // TODO: 2022/11/28 计量规程文件替换接口 + + @ApiOperation("文件删除") @PostMapping("/delete") @ResponseBody diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml index 734f08e..706e7c8 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml @@ -54,7 +54,7 @@ mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department, mtsp.job, mtsp.phone FROM meter_trace_supplier mts - LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mts.supplier_id + LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mtsp.supplier_id WHERE mts.id = #{id} AND mts.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml index 7057751..27aef05 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml @@ -6,7 +6,7 @@ UPDATE meter_train_staff SET exam_result = #{item.examResult} - WHERE id = #{item.staffId} AND plan_id = #{item.planId} + WHERE staff_id = #{item.staffId} AND plan_id = #{item.planId} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java index 90272b4..4f5d319 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java @@ -56,7 +56,7 @@ /** * 文件新建、编辑（废止）、删除 * 流程：审批人列表要随着流程图信息一起上传 - * 前后端交互两种方案（待晓颖调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） + * 前后端交互两种方案（待前端调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） * 2、前端直接传bpmn文件或bpmn的xml文件（使用BpmnXMLConverter类的方法） * 文件的审批状态字段要更新，保证文件表的状态及时更新，供各列表使用 */ @@ -80,6 +80,12 @@ return meterFileService.updateFile(idDTO.getId()); } + /** + * 计量规程文件替换 + */ + // TODO: 2022/11/28 计量规程文件替换接口 + + @ApiOperation("文件删除") @PostMapping("/delete") @ResponseBody diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml index 734f08e..706e7c8 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml @@ -54,7 +54,7 @@ mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department, mtsp.job, mtsp.phone FROM meter_trace_supplier mts - LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mts.supplier_id + LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mtsp.supplier_id WHERE mts.id = #{id} AND mts.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml index 7057751..27aef05 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml @@ -6,7 +6,7 @@ UPDATE meter_train_staff SET exam_result = #{item.examResult} - WHERE id = #{item.staffId} AND plan_id = #{item.planId} + WHERE staff_id = #{item.staffId} AND plan_id = #{item.planId} diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java new file mode 100644 index 0000000..810e3fd --- /dev/null +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java @@ -0,0 +1,32 @@ +package com.casic.missiles.job.handler; + +/** + * @Description: 计量文件JobHandler + * @Author: wangpeng + * @Date: 2022/11/29 14:22 + */ + +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; + +@Slf4j +@Component +public class FileJobHandler { + + /** + * 文件实施状态变更任务 + * @param param + * @return + * @throws Exception + */ + @XxlJob(value = "fileEffectiveStatusHandler") + public ReturnT execute(String param) throws Exception { + // TODO: 文件实施状态变更任务 + return SUCCESS; + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java index 90272b4..4f5d319 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java @@ -56,7 +56,7 @@ /** * 文件新建、编辑（废止）、删除 * 流程：审批人列表要随着流程图信息一起上传 - * 前后端交互两种方案（待晓颖调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） + * 前后端交互两种方案（待前端调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） * 2、前端直接传bpmn文件或bpmn的xml文件（使用BpmnXMLConverter类的方法） * 文件的审批状态字段要更新，保证文件表的状态及时更新，供各列表使用 */ @@ -80,6 +80,12 @@ return meterFileService.updateFile(idDTO.getId()); } + /** + * 计量规程文件替换 + */ + // TODO: 2022/11/28 计量规程文件替换接口 + + @ApiOperation("文件删除") @PostMapping("/delete") @ResponseBody diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml index 734f08e..706e7c8 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml @@ -54,7 +54,7 @@ mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department, mtsp.job, mtsp.phone FROM meter_trace_supplier mts - LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mts.supplier_id + LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mtsp.supplier_id WHERE mts.id = #{id} AND mts.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml index 7057751..27aef05 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml @@ -6,7 +6,7 @@ UPDATE meter_train_staff SET exam_result = #{item.examResult} - WHERE id = #{item.staffId} AND plan_id = #{item.planId} + WHERE staff_id = #{item.staffId} AND plan_id = #{item.planId} diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java new file mode 100644 index 0000000..810e3fd --- /dev/null +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java @@ -0,0 +1,32 @@ +package com.casic.missiles.job.handler; + +/** + * @Description: 计量文件JobHandler + * @Author: wangpeng + * @Date: 2022/11/29 14:22 + */ + +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; + +@Slf4j +@Component +public class FileJobHandler { + + /** + * 文件实施状态变更任务 + * @param param + * @return + * @throws Exception + */ + @XxlJob(value = "fileEffectiveStatusHandler") + public ReturnT execute(String param) throws Exception { + // TODO: 文件实施状态变更任务 + return SUCCESS; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java index 5fba4a1..82c56e5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java @@ -179,10 +179,10 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatusName; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java index 90272b4..4f5d319 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java @@ -56,7 +56,7 @@ /** * 文件新建、编辑（废止）、删除 * 流程：审批人列表要随着流程图信息一起上传 - * 前后端交互两种方案（待晓颖调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） + * 前后端交互两种方案（待前端调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） * 2、前端直接传bpmn文件或bpmn的xml文件（使用BpmnXMLConverter类的方法） * 文件的审批状态字段要更新，保证文件表的状态及时更新，供各列表使用 */ @@ -80,6 +80,12 @@ return meterFileService.updateFile(idDTO.getId()); } + /** + * 计量规程文件替换 + */ + // TODO: 2022/11/28 计量规程文件替换接口 + + @ApiOperation("文件删除") @PostMapping("/delete") @ResponseBody diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml index 734f08e..706e7c8 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml @@ -54,7 +54,7 @@ mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department, mtsp.job, mtsp.phone FROM meter_trace_supplier mts - LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mts.supplier_id + LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mtsp.supplier_id WHERE mts.id = #{id} AND mts.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml index 7057751..27aef05 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml @@ -6,7 +6,7 @@ UPDATE meter_train_staff SET exam_result = #{item.examResult} - WHERE id = #{item.staffId} AND plan_id = #{item.planId} + WHERE staff_id = #{item.staffId} AND plan_id = #{item.planId} diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java new file mode 100644 index 0000000..810e3fd --- /dev/null +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java @@ -0,0 +1,32 @@ +package com.casic.missiles.job.handler; + +/** + * @Description: 计量文件JobHandler + * @Author: wangpeng + * @Date: 2022/11/29 14:22 + */ + +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; + +@Slf4j +@Component +public class FileJobHandler { + + /** + * 文件实施状态变更任务 + * @param param + * @return + * @throws Exception + */ + @XxlJob(value = "fileEffectiveStatusHandler") + public ReturnT execute(String param) throws Exception { + // TODO: 文件实施状态变更任务 + return SUCCESS; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java index 5fba4a1..82c56e5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java @@ -179,10 +179,10 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatusName; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java index 41862c9..54f5ad6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java @@ -13,68 +13,63 @@ @Data public class TrainLogAddRequest { /** - * 培训计录编号 - */ - private String logNo; - - /** * 填表人 */ - @ApiModelProperty(value = "填表人", dataType = "String") + @ApiModelProperty(value = "填表人", dataType = "String", required = true) private String preparer; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") + @ApiModelProperty(value = "培训计划表id", dataType = "String", required = true) private Long planId; /** * 培训名称 */ - @ApiModelProperty(value = "培训名称", dataType = "String") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) private String trainName; /** * 培训对象 */ - @ApiModelProperty(value = "培训对象", dataType = "String") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) private String trainPerson; /** * 培训人数 */ - @ApiModelProperty(value = "培训人数", dataType = "Integer") + @ApiModelProperty(value = "培训人数", dataType = "Integer", required = true) private Integer trainNumber; /** * 培训时间 */ - @ApiModelProperty(value = "培训时间", dataType = "String") + @ApiModelProperty(value = "培训时间", dataType = "String", required = true) private String trainTime; /** * 培训学时 */ - @ApiModelProperty(value = "培训学时", dataType = "String") + @ApiModelProperty(value = "培训学时", dataType = "String", required = true) private String trainHour; /** * 培训地点 */ - @ApiModelProperty(value = "培训地点", dataType = "String") + @ApiModelProperty(value = "培训地点", dataType = "String", required = true) private String trainAddress; /** * 培训内容 */ - @ApiModelProperty(value = "培训内容", dataType = "String") + @ApiModelProperty(value = "培训内容", dataType = "String", required = true) private String trainContent; /** * 培训效果 */ - @ApiModelProperty(value = "培训效果", dataType = "String") + @ApiModelProperty(value = "培训效果", dataType = "String", required = true) private String trainEffect; /** @@ -98,6 +93,6 @@ /** * 培训学员 */ - @ApiModelProperty(value = "培训学员列表", dataType = "List") + @ApiModelProperty(value = "培训学员列表", dataType = "List", required = true) private List trainStaffList; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java index 90272b4..4f5d319 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java @@ -56,7 +56,7 @@ /** * 文件新建、编辑（废止）、删除 * 流程：审批人列表要随着流程图信息一起上传 - * 前后端交互两种方案（待晓颖调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） + * 前后端交互两种方案（待前端调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） * 2、前端直接传bpmn文件或bpmn的xml文件（使用BpmnXMLConverter类的方法） * 文件的审批状态字段要更新，保证文件表的状态及时更新，供各列表使用 */ @@ -80,6 +80,12 @@ return meterFileService.updateFile(idDTO.getId()); } + /** + * 计量规程文件替换 + */ + // TODO: 2022/11/28 计量规程文件替换接口 + + @ApiOperation("文件删除") @PostMapping("/delete") @ResponseBody diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml index 734f08e..706e7c8 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml @@ -54,7 +54,7 @@ mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department, mtsp.job, mtsp.phone FROM meter_trace_supplier mts - LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mts.supplier_id + LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mtsp.supplier_id WHERE mts.id = #{id} AND mts.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml index 7057751..27aef05 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml @@ -6,7 +6,7 @@ UPDATE meter_train_staff SET exam_result = #{item.examResult} - WHERE id = #{item.staffId} AND plan_id = #{item.planId} + WHERE staff_id = #{item.staffId} AND plan_id = #{item.planId} diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java new file mode 100644 index 0000000..810e3fd --- /dev/null +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java @@ -0,0 +1,32 @@ +package com.casic.missiles.job.handler; + +/** + * @Description: 计量文件JobHandler + * @Author: wangpeng + * @Date: 2022/11/29 14:22 + */ + +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; + +@Slf4j +@Component +public class FileJobHandler { + + /** + * 文件实施状态变更任务 + * @param param + * @return + * @throws Exception + */ + @XxlJob(value = "fileEffectiveStatusHandler") + public ReturnT execute(String param) throws Exception { + // TODO: 文件实施状态变更任务 + return SUCCESS; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java index 5fba4a1..82c56e5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java @@ -179,10 +179,10 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatusName; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java index 41862c9..54f5ad6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java @@ -13,68 +13,63 @@ @Data public class TrainLogAddRequest { /** - * 培训计录编号 - */ - private String logNo; - - /** * 填表人 */ - @ApiModelProperty(value = "填表人", dataType = "String") + @ApiModelProperty(value = "填表人", dataType = "String", required = true) private String preparer; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") + @ApiModelProperty(value = "培训计划表id", dataType = "String", required = true) private Long planId; /** * 培训名称 */ - @ApiModelProperty(value = "培训名称", dataType = "String") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) private String trainName; /** * 培训对象 */ - @ApiModelProperty(value = "培训对象", dataType = "String") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) private String trainPerson; /** * 培训人数 */ - @ApiModelProperty(value = "培训人数", dataType = "Integer") + @ApiModelProperty(value = "培训人数", dataType = "Integer", required = true) private Integer trainNumber; /** * 培训时间 */ - @ApiModelProperty(value = "培训时间", dataType = "String") + @ApiModelProperty(value = "培训时间", dataType = "String", required = true) private String trainTime; /** * 培训学时 */ - @ApiModelProperty(value = "培训学时", dataType = "String") + @ApiModelProperty(value = "培训学时", dataType = "String", required = true) private String trainHour; /** * 培训地点 */ - @ApiModelProperty(value = "培训地点", dataType = "String") + @ApiModelProperty(value = "培训地点", dataType = "String", required = true) private String trainAddress; /** * 培训内容 */ - @ApiModelProperty(value = "培训内容", dataType = "String") + @ApiModelProperty(value = "培训内容", dataType = "String", required = true) private String trainContent; /** * 培训效果 */ - @ApiModelProperty(value = "培训效果", dataType = "String") + @ApiModelProperty(value = "培训效果", dataType = "String", required = true) private String trainEffect; /** @@ -98,6 +93,6 @@ /** * 培训学员 */ - @ApiModelProperty(value = "培训学员列表", dataType = "List") + @ApiModelProperty(value = "培训学员列表", dataType = "List", required = true) private List trainStaffList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java index 30828d7..d4611bc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java @@ -15,14 +15,14 @@ /** * 计量人员表id */ - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + private Long staffId; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") - private String planId; + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + private Long planId; /** * 考核结果-存文字 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java index 90272b4..4f5d319 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java @@ -56,7 +56,7 @@ /** * 文件新建、编辑（废止）、删除 * 流程：审批人列表要随着流程图信息一起上传 - * 前后端交互两种方案（待晓颖调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） + * 前后端交互两种方案（待前端调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） * 2、前端直接传bpmn文件或bpmn的xml文件（使用BpmnXMLConverter类的方法） * 文件的审批状态字段要更新，保证文件表的状态及时更新，供各列表使用 */ @@ -80,6 +80,12 @@ return meterFileService.updateFile(idDTO.getId()); } + /** + * 计量规程文件替换 + */ + // TODO: 2022/11/28 计量规程文件替换接口 + + @ApiOperation("文件删除") @PostMapping("/delete") @ResponseBody diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml index 734f08e..706e7c8 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml @@ -54,7 +54,7 @@ mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department, mtsp.job, mtsp.phone FROM meter_trace_supplier mts - LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mts.supplier_id + LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mtsp.supplier_id WHERE mts.id = #{id} AND mts.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml index 7057751..27aef05 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml @@ -6,7 +6,7 @@ UPDATE meter_train_staff SET exam_result = #{item.examResult} - WHERE id = #{item.staffId} AND plan_id = #{item.planId} + WHERE staff_id = #{item.staffId} AND plan_id = #{item.planId} diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java new file mode 100644 index 0000000..810e3fd --- /dev/null +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java @@ -0,0 +1,32 @@ +package com.casic.missiles.job.handler; + +/** + * @Description: 计量文件JobHandler + * @Author: wangpeng + * @Date: 2022/11/29 14:22 + */ + +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; + +@Slf4j +@Component +public class FileJobHandler { + + /** + * 文件实施状态变更任务 + * @param param + * @return + * @throws Exception + */ + @XxlJob(value = "fileEffectiveStatusHandler") + public ReturnT execute(String param) throws Exception { + // TODO: 文件实施状态变更任务 + return SUCCESS; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java index 5fba4a1..82c56e5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java @@ -179,10 +179,10 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatusName; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java index 41862c9..54f5ad6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java @@ -13,68 +13,63 @@ @Data public class TrainLogAddRequest { /** - * 培训计录编号 - */ - private String logNo; - - /** * 填表人 */ - @ApiModelProperty(value = "填表人", dataType = "String") + @ApiModelProperty(value = "填表人", dataType = "String", required = true) private String preparer; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") + @ApiModelProperty(value = "培训计划表id", dataType = "String", required = true) private Long planId; /** * 培训名称 */ - @ApiModelProperty(value = "培训名称", dataType = "String") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) private String trainName; /** * 培训对象 */ - @ApiModelProperty(value = "培训对象", dataType = "String") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) private String trainPerson; /** * 培训人数 */ - @ApiModelProperty(value = "培训人数", dataType = "Integer") + @ApiModelProperty(value = "培训人数", dataType = "Integer", required = true) private Integer trainNumber; /** * 培训时间 */ - @ApiModelProperty(value = "培训时间", dataType = "String") + @ApiModelProperty(value = "培训时间", dataType = "String", required = true) private String trainTime; /** * 培训学时 */ - @ApiModelProperty(value = "培训学时", dataType = "String") + @ApiModelProperty(value = "培训学时", dataType = "String", required = true) private String trainHour; /** * 培训地点 */ - @ApiModelProperty(value = "培训地点", dataType = "String") + @ApiModelProperty(value = "培训地点", dataType = "String", required = true) private String trainAddress; /** * 培训内容 */ - @ApiModelProperty(value = "培训内容", dataType = "String") + @ApiModelProperty(value = "培训内容", dataType = "String", required = true) private String trainContent; /** * 培训效果 */ - @ApiModelProperty(value = "培训效果", dataType = "String") + @ApiModelProperty(value = "培训效果", dataType = "String", required = true) private String trainEffect; /** @@ -98,6 +93,6 @@ /** * 培训学员 */ - @ApiModelProperty(value = "培训学员列表", dataType = "List") + @ApiModelProperty(value = "培训学员列表", dataType = "List", required = true) private List trainStaffList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java index 30828d7..d4611bc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java @@ -15,14 +15,14 @@ /** * 计量人员表id */ - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + private Long staffId; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") - private String planId; + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + private Long planId; /** * 考核结果-存文字 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java index f7604a9..7c5fc6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java @@ -8,6 +8,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -33,7 +34,7 @@ * 组织部门id-系统组织表 */ @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotBlank(message = "系统组织部门id不能为空") + @NotNull(message = "系统组织部门id不能为空") @TableField("dept_id") private Long deptId; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java index 90272b4..4f5d319 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java @@ -56,7 +56,7 @@ /** * 文件新建、编辑（废止）、删除 * 流程：审批人列表要随着流程图信息一起上传 - * 前后端交互两种方案（待晓颖调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） + * 前后端交互两种方案（待前端调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） * 2、前端直接传bpmn文件或bpmn的xml文件（使用BpmnXMLConverter类的方法） * 文件的审批状态字段要更新，保证文件表的状态及时更新，供各列表使用 */ @@ -80,6 +80,12 @@ return meterFileService.updateFile(idDTO.getId()); } + /** + * 计量规程文件替换 + */ + // TODO: 2022/11/28 计量规程文件替换接口 + + @ApiOperation("文件删除") @PostMapping("/delete") @ResponseBody diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml index 734f08e..706e7c8 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml @@ -54,7 +54,7 @@ mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department, mtsp.job, mtsp.phone FROM meter_trace_supplier mts - LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mts.supplier_id + LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mtsp.supplier_id WHERE mts.id = #{id} AND mts.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml index 7057751..27aef05 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml @@ -6,7 +6,7 @@ UPDATE meter_train_staff SET exam_result = #{item.examResult} - WHERE id = #{item.staffId} AND plan_id = #{item.planId} + WHERE staff_id = #{item.staffId} AND plan_id = #{item.planId} diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java new file mode 100644 index 0000000..810e3fd --- /dev/null +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java @@ -0,0 +1,32 @@ +package com.casic.missiles.job.handler; + +/** + * @Description: 计量文件JobHandler + * @Author: wangpeng + * @Date: 2022/11/29 14:22 + */ + +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; + +@Slf4j +@Component +public class FileJobHandler { + + /** + * 文件实施状态变更任务 + * @param param + * @return + * @throws Exception + */ + @XxlJob(value = "fileEffectiveStatusHandler") + public ReturnT execute(String param) throws Exception { + // TODO: 文件实施状态变更任务 + return SUCCESS; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java index 5fba4a1..82c56e5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java @@ -179,10 +179,10 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatusName; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java index 41862c9..54f5ad6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java @@ -13,68 +13,63 @@ @Data public class TrainLogAddRequest { /** - * 培训计录编号 - */ - private String logNo; - - /** * 填表人 */ - @ApiModelProperty(value = "填表人", dataType = "String") + @ApiModelProperty(value = "填表人", dataType = "String", required = true) private String preparer; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") + @ApiModelProperty(value = "培训计划表id", dataType = "String", required = true) private Long planId; /** * 培训名称 */ - @ApiModelProperty(value = "培训名称", dataType = "String") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) private String trainName; /** * 培训对象 */ - @ApiModelProperty(value = "培训对象", dataType = "String") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) private String trainPerson; /** * 培训人数 */ - @ApiModelProperty(value = "培训人数", dataType = "Integer") + @ApiModelProperty(value = "培训人数", dataType = "Integer", required = true) private Integer trainNumber; /** * 培训时间 */ - @ApiModelProperty(value = "培训时间", dataType = "String") + @ApiModelProperty(value = "培训时间", dataType = "String", required = true) private String trainTime; /** * 培训学时 */ - @ApiModelProperty(value = "培训学时", dataType = "String") + @ApiModelProperty(value = "培训学时", dataType = "String", required = true) private String trainHour; /** * 培训地点 */ - @ApiModelProperty(value = "培训地点", dataType = "String") + @ApiModelProperty(value = "培训地点", dataType = "String", required = true) private String trainAddress; /** * 培训内容 */ - @ApiModelProperty(value = "培训内容", dataType = "String") + @ApiModelProperty(value = "培训内容", dataType = "String", required = true) private String trainContent; /** * 培训效果 */ - @ApiModelProperty(value = "培训效果", dataType = "String") + @ApiModelProperty(value = "培训效果", dataType = "String", required = true) private String trainEffect; /** @@ -98,6 +93,6 @@ /** * 培训学员 */ - @ApiModelProperty(value = "培训学员列表", dataType = "List") + @ApiModelProperty(value = "培训学员列表", dataType = "List", required = true) private List trainStaffList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java index 30828d7..d4611bc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java @@ -15,14 +15,14 @@ /** * 计量人员表id */ - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + private Long staffId; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") - private String planId; + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + private Long planId; /** * 考核结果-存文字 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java index f7604a9..7c5fc6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java @@ -8,6 +8,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -33,7 +34,7 @@ * 组织部门id-系统组织表 */ @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotBlank(message = "系统组织部门id不能为空") + @NotNull(message = "系统组织部门id不能为空") @TableField("dept_id") private Long deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java index d994aeb..742c666 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java @@ -224,11 +224,11 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) @TableField("approval_status") private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value（列表接口返回参数）", dataType = "String") + @ApiModelProperty(hidden = true) @TableField(exist = false) private String approvalStatusName; @@ -256,7 +256,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java index 90272b4..4f5d319 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java @@ -56,7 +56,7 @@ /** * 文件新建、编辑（废止）、删除 * 流程：审批人列表要随着流程图信息一起上传 - * 前后端交互两种方案（待晓颖调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） + * 前后端交互两种方案（待前端调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） * 2、前端直接传bpmn文件或bpmn的xml文件（使用BpmnXMLConverter类的方法） * 文件的审批状态字段要更新，保证文件表的状态及时更新，供各列表使用 */ @@ -80,6 +80,12 @@ return meterFileService.updateFile(idDTO.getId()); } + /** + * 计量规程文件替换 + */ + // TODO: 2022/11/28 计量规程文件替换接口 + + @ApiOperation("文件删除") @PostMapping("/delete") @ResponseBody diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml index 734f08e..706e7c8 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml @@ -54,7 +54,7 @@ mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department, mtsp.job, mtsp.phone FROM meter_trace_supplier mts - LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mts.supplier_id + LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mtsp.supplier_id WHERE mts.id = #{id} AND mts.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml index 7057751..27aef05 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml @@ -6,7 +6,7 @@ UPDATE meter_train_staff SET exam_result = #{item.examResult} - WHERE id = #{item.staffId} AND plan_id = #{item.planId} + WHERE staff_id = #{item.staffId} AND plan_id = #{item.planId} diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java new file mode 100644 index 0000000..810e3fd --- /dev/null +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java @@ -0,0 +1,32 @@ +package com.casic.missiles.job.handler; + +/** + * @Description: 计量文件JobHandler + * @Author: wangpeng + * @Date: 2022/11/29 14:22 + */ + +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; + +@Slf4j +@Component +public class FileJobHandler { + + /** + * 文件实施状态变更任务 + * @param param + * @return + * @throws Exception + */ + @XxlJob(value = "fileEffectiveStatusHandler") + public ReturnT execute(String param) throws Exception { + // TODO: 文件实施状态变更任务 + return SUCCESS; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java index 5fba4a1..82c56e5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java @@ -179,10 +179,10 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatusName; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java index 41862c9..54f5ad6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java @@ -13,68 +13,63 @@ @Data public class TrainLogAddRequest { /** - * 培训计录编号 - */ - private String logNo; - - /** * 填表人 */ - @ApiModelProperty(value = "填表人", dataType = "String") + @ApiModelProperty(value = "填表人", dataType = "String", required = true) private String preparer; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") + @ApiModelProperty(value = "培训计划表id", dataType = "String", required = true) private Long planId; /** * 培训名称 */ - @ApiModelProperty(value = "培训名称", dataType = "String") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) private String trainName; /** * 培训对象 */ - @ApiModelProperty(value = "培训对象", dataType = "String") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) private String trainPerson; /** * 培训人数 */ - @ApiModelProperty(value = "培训人数", dataType = "Integer") + @ApiModelProperty(value = "培训人数", dataType = "Integer", required = true) private Integer trainNumber; /** * 培训时间 */ - @ApiModelProperty(value = "培训时间", dataType = "String") + @ApiModelProperty(value = "培训时间", dataType = "String", required = true) private String trainTime; /** * 培训学时 */ - @ApiModelProperty(value = "培训学时", dataType = "String") + @ApiModelProperty(value = "培训学时", dataType = "String", required = true) private String trainHour; /** * 培训地点 */ - @ApiModelProperty(value = "培训地点", dataType = "String") + @ApiModelProperty(value = "培训地点", dataType = "String", required = true) private String trainAddress; /** * 培训内容 */ - @ApiModelProperty(value = "培训内容", dataType = "String") + @ApiModelProperty(value = "培训内容", dataType = "String", required = true) private String trainContent; /** * 培训效果 */ - @ApiModelProperty(value = "培训效果", dataType = "String") + @ApiModelProperty(value = "培训效果", dataType = "String", required = true) private String trainEffect; /** @@ -98,6 +93,6 @@ /** * 培训学员 */ - @ApiModelProperty(value = "培训学员列表", dataType = "List") + @ApiModelProperty(value = "培训学员列表", dataType = "List", required = true) private List trainStaffList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java index 30828d7..d4611bc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java @@ -15,14 +15,14 @@ /** * 计量人员表id */ - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + private Long staffId; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") - private String planId; + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + private Long planId; /** * 考核结果-存文字 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java index f7604a9..7c5fc6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java @@ -8,6 +8,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -33,7 +34,7 @@ * 组织部门id-系统组织表 */ @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotBlank(message = "系统组织部门id不能为空") + @NotNull(message = "系统组织部门id不能为空") @TableField("dept_id") private Long deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java index d994aeb..742c666 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java @@ -224,11 +224,11 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) @TableField("approval_status") private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value（列表接口返回参数）", dataType = "String") + @ApiModelProperty(hidden = true) @TableField(exist = false) private String approvalStatusName; @@ -256,7 +256,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java index 1b55c05..70c9e1f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java @@ -31,7 +31,7 @@ /** * 溯源供方表id */ - @ApiModelProperty(value = "溯源供方表id", dataType = "Long") + @ApiModelProperty(hidden = true) @TableField("supplier_id") private Long supplierId; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java index 90272b4..4f5d319 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java @@ -56,7 +56,7 @@ /** * 文件新建、编辑（废止）、删除 * 流程：审批人列表要随着流程图信息一起上传 - * 前后端交互两种方案（待晓颖调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） + * 前后端交互两种方案（待前端调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） * 2、前端直接传bpmn文件或bpmn的xml文件（使用BpmnXMLConverter类的方法） * 文件的审批状态字段要更新，保证文件表的状态及时更新，供各列表使用 */ @@ -80,6 +80,12 @@ return meterFileService.updateFile(idDTO.getId()); } + /** + * 计量规程文件替换 + */ + // TODO: 2022/11/28 计量规程文件替换接口 + + @ApiOperation("文件删除") @PostMapping("/delete") @ResponseBody diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml index 734f08e..706e7c8 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml @@ -54,7 +54,7 @@ mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department, mtsp.job, mtsp.phone FROM meter_trace_supplier mts - LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mts.supplier_id + LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mtsp.supplier_id WHERE mts.id = #{id} AND mts.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml index 7057751..27aef05 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml @@ -6,7 +6,7 @@ UPDATE meter_train_staff SET exam_result = #{item.examResult} - WHERE id = #{item.staffId} AND plan_id = #{item.planId} + WHERE staff_id = #{item.staffId} AND plan_id = #{item.planId} diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java new file mode 100644 index 0000000..810e3fd --- /dev/null +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java @@ -0,0 +1,32 @@ +package com.casic.missiles.job.handler; + +/** + * @Description: 计量文件JobHandler + * @Author: wangpeng + * @Date: 2022/11/29 14:22 + */ + +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; + +@Slf4j +@Component +public class FileJobHandler { + + /** + * 文件实施状态变更任务 + * @param param + * @return + * @throws Exception + */ + @XxlJob(value = "fileEffectiveStatusHandler") + public ReturnT execute(String param) throws Exception { + // TODO: 文件实施状态变更任务 + return SUCCESS; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java index 5fba4a1..82c56e5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java @@ -179,10 +179,10 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatusName; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java index 41862c9..54f5ad6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java @@ -13,68 +13,63 @@ @Data public class TrainLogAddRequest { /** - * 培训计录编号 - */ - private String logNo; - - /** * 填表人 */ - @ApiModelProperty(value = "填表人", dataType = "String") + @ApiModelProperty(value = "填表人", dataType = "String", required = true) private String preparer; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") + @ApiModelProperty(value = "培训计划表id", dataType = "String", required = true) private Long planId; /** * 培训名称 */ - @ApiModelProperty(value = "培训名称", dataType = "String") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) private String trainName; /** * 培训对象 */ - @ApiModelProperty(value = "培训对象", dataType = "String") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) private String trainPerson; /** * 培训人数 */ - @ApiModelProperty(value = "培训人数", dataType = "Integer") + @ApiModelProperty(value = "培训人数", dataType = "Integer", required = true) private Integer trainNumber; /** * 培训时间 */ - @ApiModelProperty(value = "培训时间", dataType = "String") + @ApiModelProperty(value = "培训时间", dataType = "String", required = true) private String trainTime; /** * 培训学时 */ - @ApiModelProperty(value = "培训学时", dataType = "String") + @ApiModelProperty(value = "培训学时", dataType = "String", required = true) private String trainHour; /** * 培训地点 */ - @ApiModelProperty(value = "培训地点", dataType = "String") + @ApiModelProperty(value = "培训地点", dataType = "String", required = true) private String trainAddress; /** * 培训内容 */ - @ApiModelProperty(value = "培训内容", dataType = "String") + @ApiModelProperty(value = "培训内容", dataType = "String", required = true) private String trainContent; /** * 培训效果 */ - @ApiModelProperty(value = "培训效果", dataType = "String") + @ApiModelProperty(value = "培训效果", dataType = "String", required = true) private String trainEffect; /** @@ -98,6 +93,6 @@ /** * 培训学员 */ - @ApiModelProperty(value = "培训学员列表", dataType = "List") + @ApiModelProperty(value = "培训学员列表", dataType = "List", required = true) private List trainStaffList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java index 30828d7..d4611bc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java @@ -15,14 +15,14 @@ /** * 计量人员表id */ - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + private Long staffId; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") - private String planId; + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + private Long planId; /** * 考核结果-存文字 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java index f7604a9..7c5fc6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java @@ -8,6 +8,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -33,7 +34,7 @@ * 组织部门id-系统组织表 */ @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotBlank(message = "系统组织部门id不能为空") + @NotNull(message = "系统组织部门id不能为空") @TableField("dept_id") private Long deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java index d994aeb..742c666 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java @@ -224,11 +224,11 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) @TableField("approval_status") private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value（列表接口返回参数）", dataType = "String") + @ApiModelProperty(hidden = true) @TableField(exist = false) private String approvalStatusName; @@ -256,7 +256,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java index 1b55c05..70c9e1f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java @@ -31,7 +31,7 @@ /** * 溯源供方表id */ - @ApiModelProperty(value = "溯源供方表id", dataType = "Long") + @ApiModelProperty(hidden = true) @TableField("supplier_id") private Long supplierId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java index 016b8be..5695eeb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java @@ -134,7 +134,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java index 90272b4..4f5d319 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java @@ -56,7 +56,7 @@ /** * 文件新建、编辑（废止）、删除 * 流程：审批人列表要随着流程图信息一起上传 - * 前后端交互两种方案（待晓颖调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） + * 前后端交互两种方案（待前端调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） * 2、前端直接传bpmn文件或bpmn的xml文件（使用BpmnXMLConverter类的方法） * 文件的审批状态字段要更新，保证文件表的状态及时更新，供各列表使用 */ @@ -80,6 +80,12 @@ return meterFileService.updateFile(idDTO.getId()); } + /** + * 计量规程文件替换 + */ + // TODO: 2022/11/28 计量规程文件替换接口 + + @ApiOperation("文件删除") @PostMapping("/delete") @ResponseBody diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml index 734f08e..706e7c8 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml @@ -54,7 +54,7 @@ mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department, mtsp.job, mtsp.phone FROM meter_trace_supplier mts - LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mts.supplier_id + LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mtsp.supplier_id WHERE mts.id = #{id} AND mts.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml index 7057751..27aef05 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml @@ -6,7 +6,7 @@ UPDATE meter_train_staff SET exam_result = #{item.examResult} - WHERE id = #{item.staffId} AND plan_id = #{item.planId} + WHERE staff_id = #{item.staffId} AND plan_id = #{item.planId} diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java new file mode 100644 index 0000000..810e3fd --- /dev/null +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java @@ -0,0 +1,32 @@ +package com.casic.missiles.job.handler; + +/** + * @Description: 计量文件JobHandler + * @Author: wangpeng + * @Date: 2022/11/29 14:22 + */ + +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; + +@Slf4j +@Component +public class FileJobHandler { + + /** + * 文件实施状态变更任务 + * @param param + * @return + * @throws Exception + */ + @XxlJob(value = "fileEffectiveStatusHandler") + public ReturnT execute(String param) throws Exception { + // TODO: 文件实施状态变更任务 + return SUCCESS; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java index 5fba4a1..82c56e5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java @@ -179,10 +179,10 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatusName; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java index 41862c9..54f5ad6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java @@ -13,68 +13,63 @@ @Data public class TrainLogAddRequest { /** - * 培训计录编号 - */ - private String logNo; - - /** * 填表人 */ - @ApiModelProperty(value = "填表人", dataType = "String") + @ApiModelProperty(value = "填表人", dataType = "String", required = true) private String preparer; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") + @ApiModelProperty(value = "培训计划表id", dataType = "String", required = true) private Long planId; /** * 培训名称 */ - @ApiModelProperty(value = "培训名称", dataType = "String") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) private String trainName; /** * 培训对象 */ - @ApiModelProperty(value = "培训对象", dataType = "String") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) private String trainPerson; /** * 培训人数 */ - @ApiModelProperty(value = "培训人数", dataType = "Integer") + @ApiModelProperty(value = "培训人数", dataType = "Integer", required = true) private Integer trainNumber; /** * 培训时间 */ - @ApiModelProperty(value = "培训时间", dataType = "String") + @ApiModelProperty(value = "培训时间", dataType = "String", required = true) private String trainTime; /** * 培训学时 */ - @ApiModelProperty(value = "培训学时", dataType = "String") + @ApiModelProperty(value = "培训学时", dataType = "String", required = true) private String trainHour; /** * 培训地点 */ - @ApiModelProperty(value = "培训地点", dataType = "String") + @ApiModelProperty(value = "培训地点", dataType = "String", required = true) private String trainAddress; /** * 培训内容 */ - @ApiModelProperty(value = "培训内容", dataType = "String") + @ApiModelProperty(value = "培训内容", dataType = "String", required = true) private String trainContent; /** * 培训效果 */ - @ApiModelProperty(value = "培训效果", dataType = "String") + @ApiModelProperty(value = "培训效果", dataType = "String", required = true) private String trainEffect; /** @@ -98,6 +93,6 @@ /** * 培训学员 */ - @ApiModelProperty(value = "培训学员列表", dataType = "List") + @ApiModelProperty(value = "培训学员列表", dataType = "List", required = true) private List trainStaffList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java index 30828d7..d4611bc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java @@ -15,14 +15,14 @@ /** * 计量人员表id */ - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + private Long staffId; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") - private String planId; + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + private Long planId; /** * 考核结果-存文字 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java index f7604a9..7c5fc6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java @@ -8,6 +8,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -33,7 +34,7 @@ * 组织部门id-系统组织表 */ @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotBlank(message = "系统组织部门id不能为空") + @NotNull(message = "系统组织部门id不能为空") @TableField("dept_id") private Long deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java index d994aeb..742c666 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java @@ -224,11 +224,11 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) @TableField("approval_status") private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value（列表接口返回参数）", dataType = "String") + @ApiModelProperty(hidden = true) @TableField(exist = false) private String approvalStatusName; @@ -256,7 +256,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java index 1b55c05..70c9e1f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java @@ -31,7 +31,7 @@ /** * 溯源供方表id */ - @ApiModelProperty(value = "溯源供方表id", dataType = "Long") + @ApiModelProperty(hidden = true) @TableField("supplier_id") private Long supplierId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java index 016b8be..5695eeb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java @@ -134,7 +134,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java index 3093e1c..8dfc613 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java @@ -125,11 +125,11 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) @TableField("approval_status") private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value（列表接口参数）", dataType = "String") + @ApiModelProperty(hidden = true) @TableField(exist = false) private String approvalStatusName; @@ -143,7 +143,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java index 90272b4..4f5d319 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java @@ -56,7 +56,7 @@ /** * 文件新建、编辑（废止）、删除 * 流程：审批人列表要随着流程图信息一起上传 - * 前后端交互两种方案（待晓颖调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） + * 前后端交互两种方案（待前端调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） * 2、前端直接传bpmn文件或bpmn的xml文件（使用BpmnXMLConverter类的方法） * 文件的审批状态字段要更新，保证文件表的状态及时更新，供各列表使用 */ @@ -80,6 +80,12 @@ return meterFileService.updateFile(idDTO.getId()); } + /** + * 计量规程文件替换 + */ + // TODO: 2022/11/28 计量规程文件替换接口 + + @ApiOperation("文件删除") @PostMapping("/delete") @ResponseBody diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml index 734f08e..706e7c8 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml @@ -54,7 +54,7 @@ mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department, mtsp.job, mtsp.phone FROM meter_trace_supplier mts - LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mts.supplier_id + LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mtsp.supplier_id WHERE mts.id = #{id} AND mts.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml index 7057751..27aef05 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml @@ -6,7 +6,7 @@ UPDATE meter_train_staff SET exam_result = #{item.examResult} - WHERE id = #{item.staffId} AND plan_id = #{item.planId} + WHERE staff_id = #{item.staffId} AND plan_id = #{item.planId} diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java new file mode 100644 index 0000000..810e3fd --- /dev/null +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java @@ -0,0 +1,32 @@ +package com.casic.missiles.job.handler; + +/** + * @Description: 计量文件JobHandler + * @Author: wangpeng + * @Date: 2022/11/29 14:22 + */ + +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; + +@Slf4j +@Component +public class FileJobHandler { + + /** + * 文件实施状态变更任务 + * @param param + * @return + * @throws Exception + */ + @XxlJob(value = "fileEffectiveStatusHandler") + public ReturnT execute(String param) throws Exception { + // TODO: 文件实施状态变更任务 + return SUCCESS; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java index 5fba4a1..82c56e5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java @@ -179,10 +179,10 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatusName; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java index 41862c9..54f5ad6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java @@ -13,68 +13,63 @@ @Data public class TrainLogAddRequest { /** - * 培训计录编号 - */ - private String logNo; - - /** * 填表人 */ - @ApiModelProperty(value = "填表人", dataType = "String") + @ApiModelProperty(value = "填表人", dataType = "String", required = true) private String preparer; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") + @ApiModelProperty(value = "培训计划表id", dataType = "String", required = true) private Long planId; /** * 培训名称 */ - @ApiModelProperty(value = "培训名称", dataType = "String") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) private String trainName; /** * 培训对象 */ - @ApiModelProperty(value = "培训对象", dataType = "String") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) private String trainPerson; /** * 培训人数 */ - @ApiModelProperty(value = "培训人数", dataType = "Integer") + @ApiModelProperty(value = "培训人数", dataType = "Integer", required = true) private Integer trainNumber; /** * 培训时间 */ - @ApiModelProperty(value = "培训时间", dataType = "String") + @ApiModelProperty(value = "培训时间", dataType = "String", required = true) private String trainTime; /** * 培训学时 */ - @ApiModelProperty(value = "培训学时", dataType = "String") + @ApiModelProperty(value = "培训学时", dataType = "String", required = true) private String trainHour; /** * 培训地点 */ - @ApiModelProperty(value = "培训地点", dataType = "String") + @ApiModelProperty(value = "培训地点", dataType = "String", required = true) private String trainAddress; /** * 培训内容 */ - @ApiModelProperty(value = "培训内容", dataType = "String") + @ApiModelProperty(value = "培训内容", dataType = "String", required = true) private String trainContent; /** * 培训效果 */ - @ApiModelProperty(value = "培训效果", dataType = "String") + @ApiModelProperty(value = "培训效果", dataType = "String", required = true) private String trainEffect; /** @@ -98,6 +93,6 @@ /** * 培训学员 */ - @ApiModelProperty(value = "培训学员列表", dataType = "List") + @ApiModelProperty(value = "培训学员列表", dataType = "List", required = true) private List trainStaffList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java index 30828d7..d4611bc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java @@ -15,14 +15,14 @@ /** * 计量人员表id */ - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + private Long staffId; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") - private String planId; + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + private Long planId; /** * 考核结果-存文字 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java index f7604a9..7c5fc6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java @@ -8,6 +8,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -33,7 +34,7 @@ * 组织部门id-系统组织表 */ @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotBlank(message = "系统组织部门id不能为空") + @NotNull(message = "系统组织部门id不能为空") @TableField("dept_id") private Long deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java index d994aeb..742c666 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java @@ -224,11 +224,11 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) @TableField("approval_status") private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value（列表接口返回参数）", dataType = "String") + @ApiModelProperty(hidden = true) @TableField(exist = false) private String approvalStatusName; @@ -256,7 +256,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java index 1b55c05..70c9e1f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java @@ -31,7 +31,7 @@ /** * 溯源供方表id */ - @ApiModelProperty(value = "溯源供方表id", dataType = "Long") + @ApiModelProperty(hidden = true) @TableField("supplier_id") private Long supplierId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java index 016b8be..5695eeb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java @@ -134,7 +134,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java index 3093e1c..8dfc613 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java @@ -125,11 +125,11 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) @TableField("approval_status") private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value（列表接口参数）", dataType = "String") + @ApiModelProperty(hidden = true) @TableField(exist = false) private String approvalStatusName; @@ -143,7 +143,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java index 8bc08bc..6ba44dd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -21,72 +22,84 @@ private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") @TableId("id") private Long id; /** * 计量人员表id */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) @TableField("staff_id") private Long staffId; /** * 培训计划表id */ + @ApiModelProperty(hidden = true) @TableField("plan_id") private Long planId; /** * 学员名称 */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) @TableField("name") private String name; /** * 单位名称-存文字 */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") @TableField("company") private String company; /** * 技术职称-存文字 */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") @TableField("technology_job") private String technologyJob; /** * 签到时间 */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") @TableField("sign_time") private String signTime; /** * 考核结果-存文字 */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") @TableField("exam_result") private String examResult; /** * 备注 */ + @ApiModelProperty(value = "备注", dataType = "String") @TableField("remark") private String remark; /** * 删除标记 */ + @ApiModelProperty(hidden = true) @TableField("is_del") private Integer isDel; /** * 创建时间 */ + @ApiModelProperty(hidden = true) @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(hidden = true) @TableField("update_time") private String updateTime; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java index 90272b4..4f5d319 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java @@ -56,7 +56,7 @@ /** * 文件新建、编辑（废止）、删除 * 流程：审批人列表要随着流程图信息一起上传 - * 前后端交互两种方案（待晓颖调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） + * 前后端交互两种方案（待前端调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） * 2、前端直接传bpmn文件或bpmn的xml文件（使用BpmnXMLConverter类的方法） * 文件的审批状态字段要更新，保证文件表的状态及时更新，供各列表使用 */ @@ -80,6 +80,12 @@ return meterFileService.updateFile(idDTO.getId()); } + /** + * 计量规程文件替换 + */ + // TODO: 2022/11/28 计量规程文件替换接口 + + @ApiOperation("文件删除") @PostMapping("/delete") @ResponseBody diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml index 734f08e..706e7c8 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml @@ -54,7 +54,7 @@ mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department, mtsp.job, mtsp.phone FROM meter_trace_supplier mts - LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mts.supplier_id + LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mtsp.supplier_id WHERE mts.id = #{id} AND mts.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml index 7057751..27aef05 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml @@ -6,7 +6,7 @@ UPDATE meter_train_staff SET exam_result = #{item.examResult} - WHERE id = #{item.staffId} AND plan_id = #{item.planId} + WHERE staff_id = #{item.staffId} AND plan_id = #{item.planId} diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java new file mode 100644 index 0000000..810e3fd --- /dev/null +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java @@ -0,0 +1,32 @@ +package com.casic.missiles.job.handler; + +/** + * @Description: 计量文件JobHandler + * @Author: wangpeng + * @Date: 2022/11/29 14:22 + */ + +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; + +@Slf4j +@Component +public class FileJobHandler { + + /** + * 文件实施状态变更任务 + * @param param + * @return + * @throws Exception + */ + @XxlJob(value = "fileEffectiveStatusHandler") + public ReturnT execute(String param) throws Exception { + // TODO: 文件实施状态变更任务 + return SUCCESS; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java index 5fba4a1..82c56e5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java @@ -179,10 +179,10 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatusName; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java index 41862c9..54f5ad6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java @@ -13,68 +13,63 @@ @Data public class TrainLogAddRequest { /** - * 培训计录编号 - */ - private String logNo; - - /** * 填表人 */ - @ApiModelProperty(value = "填表人", dataType = "String") + @ApiModelProperty(value = "填表人", dataType = "String", required = true) private String preparer; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") + @ApiModelProperty(value = "培训计划表id", dataType = "String", required = true) private Long planId; /** * 培训名称 */ - @ApiModelProperty(value = "培训名称", dataType = "String") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) private String trainName; /** * 培训对象 */ - @ApiModelProperty(value = "培训对象", dataType = "String") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) private String trainPerson; /** * 培训人数 */ - @ApiModelProperty(value = "培训人数", dataType = "Integer") + @ApiModelProperty(value = "培训人数", dataType = "Integer", required = true) private Integer trainNumber; /** * 培训时间 */ - @ApiModelProperty(value = "培训时间", dataType = "String") + @ApiModelProperty(value = "培训时间", dataType = "String", required = true) private String trainTime; /** * 培训学时 */ - @ApiModelProperty(value = "培训学时", dataType = "String") + @ApiModelProperty(value = "培训学时", dataType = "String", required = true) private String trainHour; /** * 培训地点 */ - @ApiModelProperty(value = "培训地点", dataType = "String") + @ApiModelProperty(value = "培训地点", dataType = "String", required = true) private String trainAddress; /** * 培训内容 */ - @ApiModelProperty(value = "培训内容", dataType = "String") + @ApiModelProperty(value = "培训内容", dataType = "String", required = true) private String trainContent; /** * 培训效果 */ - @ApiModelProperty(value = "培训效果", dataType = "String") + @ApiModelProperty(value = "培训效果", dataType = "String", required = true) private String trainEffect; /** @@ -98,6 +93,6 @@ /** * 培训学员 */ - @ApiModelProperty(value = "培训学员列表", dataType = "List") + @ApiModelProperty(value = "培训学员列表", dataType = "List", required = true) private List trainStaffList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java index 30828d7..d4611bc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java @@ -15,14 +15,14 @@ /** * 计量人员表id */ - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + private Long staffId; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") - private String planId; + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + private Long planId; /** * 考核结果-存文字 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java index f7604a9..7c5fc6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java @@ -8,6 +8,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -33,7 +34,7 @@ * 组织部门id-系统组织表 */ @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotBlank(message = "系统组织部门id不能为空") + @NotNull(message = "系统组织部门id不能为空") @TableField("dept_id") private Long deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java index d994aeb..742c666 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java @@ -224,11 +224,11 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) @TableField("approval_status") private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value（列表接口返回参数）", dataType = "String") + @ApiModelProperty(hidden = true) @TableField(exist = false) private String approvalStatusName; @@ -256,7 +256,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java index 1b55c05..70c9e1f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java @@ -31,7 +31,7 @@ /** * 溯源供方表id */ - @ApiModelProperty(value = "溯源供方表id", dataType = "Long") + @ApiModelProperty(hidden = true) @TableField("supplier_id") private Long supplierId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java index 016b8be..5695eeb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java @@ -134,7 +134,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java index 3093e1c..8dfc613 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java @@ -125,11 +125,11 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) @TableField("approval_status") private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value（列表接口参数）", dataType = "String") + @ApiModelProperty(hidden = true) @TableField(exist = false) private String approvalStatusName; @@ -143,7 +143,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java index 8bc08bc..6ba44dd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -21,72 +22,84 @@ private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") @TableId("id") private Long id; /** * 计量人员表id */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) @TableField("staff_id") private Long staffId; /** * 培训计划表id */ + @ApiModelProperty(hidden = true) @TableField("plan_id") private Long planId; /** * 学员名称 */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) @TableField("name") private String name; /** * 单位名称-存文字 */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") @TableField("company") private String company; /** * 技术职称-存文字 */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") @TableField("technology_job") private String technologyJob; /** * 签到时间 */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") @TableField("sign_time") private String signTime; /** * 考核结果-存文字 */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") @TableField("exam_result") private String examResult; /** * 备注 */ + @ApiModelProperty(value = "备注", dataType = "String") @TableField("remark") private String remark; /** * 删除标记 */ + @ApiModelProperty(hidden = true) @TableField("is_del") private Integer isDel; /** * 创建时间 */ + @ApiModelProperty(hidden = true) @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(hidden = true) @TableField("update_time") private String updateTime; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java index d1b4a1b..f89d768 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java @@ -51,10 +51,10 @@ wrapper.like(StringUtils.isNotBlank(request.getFileCode()), "file_code", request.getFileCode()); wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType()); wrapper.like(!Objects.isNull(request.getEffectiveStatus()), "effective_status", request.getEffectiveStatus()); - wrapper.apply(StringUtils.isNotBlank(request.getPublishTime()), - "DATE_FORMAT(" + "'" + request.getPublishTime().split(" ")[0] + "'" + ",'%Y-%m-%d') >= DATE_FORMAT(publish_time,'%Y-%m-%d')"); + wrapper.apply(StringUtils.isNotBlank(request.getPublishTime()),//apply方法传入参数名不能为空 + "{0} >= DATE_FORMAT(publish_time,'%Y-%m-%d')", request.getPublishTime().split(" ")[0]); wrapper.apply(StringUtils.isNotBlank(request.getEffectiveTime()), - "DATE_FORMAT(" + "'" + request.getEffectiveTime().split(" ")[0] + "'" + ",'%Y-%m-%d') >= DATE_FORMAT(effective_time,'%Y-%m-%d')"); + "{0} >= DATE_FORMAT(effective_time,'%Y-%m-%d')", request.getEffectiveTime().split(" ")[0]); wrapper.eq("approval_status", ApprovalStatusEnum.PASSED.getCode()); //审批状态：已通过 wrapper.eq("is_del", 0); wrapper.orderByAsc("effective_status").orderByDesc("create_time"); @@ -76,7 +76,7 @@ // 启动文件审批流程 // activiti7中identityService被禁用了，无法使用identityService，只能在启动流程时添加流程变量 // variables.put("applyUser", purchase.getApplyer()); - file.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED.getValue()); //审批中状态 + file.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED.getCode()); //审批中状态 int row = meterFileMapper.insert(file); if(row <= 0){ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java index 90272b4..4f5d319 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java @@ -56,7 +56,7 @@ /** * 文件新建、编辑（废止）、删除 * 流程：审批人列表要随着流程图信息一起上传 - * 前后端交互两种方案（待晓颖调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） + * 前后端交互两种方案（待前端调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） * 2、前端直接传bpmn文件或bpmn的xml文件（使用BpmnXMLConverter类的方法） * 文件的审批状态字段要更新，保证文件表的状态及时更新，供各列表使用 */ @@ -80,6 +80,12 @@ return meterFileService.updateFile(idDTO.getId()); } + /** + * 计量规程文件替换 + */ + // TODO: 2022/11/28 计量规程文件替换接口 + + @ApiOperation("文件删除") @PostMapping("/delete") @ResponseBody diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml index 734f08e..706e7c8 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml @@ -54,7 +54,7 @@ mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department, mtsp.job, mtsp.phone FROM meter_trace_supplier mts - LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mts.supplier_id + LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mtsp.supplier_id WHERE mts.id = #{id} AND mts.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml index 7057751..27aef05 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml @@ -6,7 +6,7 @@ UPDATE meter_train_staff SET exam_result = #{item.examResult} - WHERE id = #{item.staffId} AND plan_id = #{item.planId} + WHERE staff_id = #{item.staffId} AND plan_id = #{item.planId} diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java new file mode 100644 index 0000000..810e3fd --- /dev/null +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java @@ -0,0 +1,32 @@ +package com.casic.missiles.job.handler; + +/** + * @Description: 计量文件JobHandler + * @Author: wangpeng + * @Date: 2022/11/29 14:22 + */ + +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; + +@Slf4j +@Component +public class FileJobHandler { + + /** + * 文件实施状态变更任务 + * @param param + * @return + * @throws Exception + */ + @XxlJob(value = "fileEffectiveStatusHandler") + public ReturnT execute(String param) throws Exception { + // TODO: 文件实施状态变更任务 + return SUCCESS; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java index 5fba4a1..82c56e5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java @@ -179,10 +179,10 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatusName; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java index 41862c9..54f5ad6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java @@ -13,68 +13,63 @@ @Data public class TrainLogAddRequest { /** - * 培训计录编号 - */ - private String logNo; - - /** * 填表人 */ - @ApiModelProperty(value = "填表人", dataType = "String") + @ApiModelProperty(value = "填表人", dataType = "String", required = true) private String preparer; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") + @ApiModelProperty(value = "培训计划表id", dataType = "String", required = true) private Long planId; /** * 培训名称 */ - @ApiModelProperty(value = "培训名称", dataType = "String") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) private String trainName; /** * 培训对象 */ - @ApiModelProperty(value = "培训对象", dataType = "String") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) private String trainPerson; /** * 培训人数 */ - @ApiModelProperty(value = "培训人数", dataType = "Integer") + @ApiModelProperty(value = "培训人数", dataType = "Integer", required = true) private Integer trainNumber; /** * 培训时间 */ - @ApiModelProperty(value = "培训时间", dataType = "String") + @ApiModelProperty(value = "培训时间", dataType = "String", required = true) private String trainTime; /** * 培训学时 */ - @ApiModelProperty(value = "培训学时", dataType = "String") + @ApiModelProperty(value = "培训学时", dataType = "String", required = true) private String trainHour; /** * 培训地点 */ - @ApiModelProperty(value = "培训地点", dataType = "String") + @ApiModelProperty(value = "培训地点", dataType = "String", required = true) private String trainAddress; /** * 培训内容 */ - @ApiModelProperty(value = "培训内容", dataType = "String") + @ApiModelProperty(value = "培训内容", dataType = "String", required = true) private String trainContent; /** * 培训效果 */ - @ApiModelProperty(value = "培训效果", dataType = "String") + @ApiModelProperty(value = "培训效果", dataType = "String", required = true) private String trainEffect; /** @@ -98,6 +93,6 @@ /** * 培训学员 */ - @ApiModelProperty(value = "培训学员列表", dataType = "List") + @ApiModelProperty(value = "培训学员列表", dataType = "List", required = true) private List trainStaffList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java index 30828d7..d4611bc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java @@ -15,14 +15,14 @@ /** * 计量人员表id */ - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + private Long staffId; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") - private String planId; + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + private Long planId; /** * 考核结果-存文字 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java index f7604a9..7c5fc6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java @@ -8,6 +8,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -33,7 +34,7 @@ * 组织部门id-系统组织表 */ @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotBlank(message = "系统组织部门id不能为空") + @NotNull(message = "系统组织部门id不能为空") @TableField("dept_id") private Long deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java index d994aeb..742c666 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java @@ -224,11 +224,11 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) @TableField("approval_status") private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value（列表接口返回参数）", dataType = "String") + @ApiModelProperty(hidden = true) @TableField(exist = false) private String approvalStatusName; @@ -256,7 +256,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java index 1b55c05..70c9e1f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java @@ -31,7 +31,7 @@ /** * 溯源供方表id */ - @ApiModelProperty(value = "溯源供方表id", dataType = "Long") + @ApiModelProperty(hidden = true) @TableField("supplier_id") private Long supplierId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java index 016b8be..5695eeb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java @@ -134,7 +134,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java index 3093e1c..8dfc613 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java @@ -125,11 +125,11 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) @TableField("approval_status") private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value（列表接口参数）", dataType = "String") + @ApiModelProperty(hidden = true) @TableField(exist = false) private String approvalStatusName; @@ -143,7 +143,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java index 8bc08bc..6ba44dd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -21,72 +22,84 @@ private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") @TableId("id") private Long id; /** * 计量人员表id */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) @TableField("staff_id") private Long staffId; /** * 培训计划表id */ + @ApiModelProperty(hidden = true) @TableField("plan_id") private Long planId; /** * 学员名称 */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) @TableField("name") private String name; /** * 单位名称-存文字 */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") @TableField("company") private String company; /** * 技术职称-存文字 */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") @TableField("technology_job") private String technologyJob; /** * 签到时间 */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") @TableField("sign_time") private String signTime; /** * 考核结果-存文字 */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") @TableField("exam_result") private String examResult; /** * 备注 */ + @ApiModelProperty(value = "备注", dataType = "String") @TableField("remark") private String remark; /** * 删除标记 */ + @ApiModelProperty(hidden = true) @TableField("is_del") private Integer isDel; /** * 创建时间 */ + @ApiModelProperty(hidden = true) @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(hidden = true) @TableField("update_time") private String updateTime; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java index d1b4a1b..f89d768 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java @@ -51,10 +51,10 @@ wrapper.like(StringUtils.isNotBlank(request.getFileCode()), "file_code", request.getFileCode()); wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType()); wrapper.like(!Objects.isNull(request.getEffectiveStatus()), "effective_status", request.getEffectiveStatus()); - wrapper.apply(StringUtils.isNotBlank(request.getPublishTime()), - "DATE_FORMAT(" + "'" + request.getPublishTime().split(" ")[0] + "'" + ",'%Y-%m-%d') >= DATE_FORMAT(publish_time,'%Y-%m-%d')"); + wrapper.apply(StringUtils.isNotBlank(request.getPublishTime()),//apply方法传入参数名不能为空 + "{0} >= DATE_FORMAT(publish_time,'%Y-%m-%d')", request.getPublishTime().split(" ")[0]); wrapper.apply(StringUtils.isNotBlank(request.getEffectiveTime()), - "DATE_FORMAT(" + "'" + request.getEffectiveTime().split(" ")[0] + "'" + ",'%Y-%m-%d') >= DATE_FORMAT(effective_time,'%Y-%m-%d')"); + "{0} >= DATE_FORMAT(effective_time,'%Y-%m-%d')", request.getEffectiveTime().split(" ")[0]); wrapper.eq("approval_status", ApprovalStatusEnum.PASSED.getCode()); //审批状态：已通过 wrapper.eq("is_del", 0); wrapper.orderByAsc("effective_status").orderByDesc("create_time"); @@ -76,7 +76,7 @@ // 启动文件审批流程 // activiti7中identityService被禁用了，无法使用identityService，只能在启动流程时添加流程变量 // variables.put("applyUser", purchase.getApplyer()); - file.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED.getValue()); //审批中状态 + file.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED.getCode()); //审批中状态 int row = meterFileMapper.insert(file); if(row <= 0){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterOrganizeServiceImpl.java index 1553705..fedd145 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterOrganizeServiceImpl.java @@ -99,6 +99,7 @@ meterOrganize.setOrganizeName(dept.getSimpleName()); meterOrganize.setOrganizeType(dept.getDeptType()); UpdateWrapper wrapper = new UpdateWrapper<>(); + //已删除数据mp该update方法无法更新 wrapper.eq("dept_id", dept.getId()); return organizeMapper.update(meterOrganize, wrapper); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java index 90272b4..4f5d319 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java @@ -56,7 +56,7 @@ /** * 文件新建、编辑（废止）、删除 * 流程：审批人列表要随着流程图信息一起上传 - * 前后端交互两种方案（待晓颖调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） + * 前后端交互两种方案（待前端调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） * 2、前端直接传bpmn文件或bpmn的xml文件（使用BpmnXMLConverter类的方法） * 文件的审批状态字段要更新，保证文件表的状态及时更新，供各列表使用 */ @@ -80,6 +80,12 @@ return meterFileService.updateFile(idDTO.getId()); } + /** + * 计量规程文件替换 + */ + // TODO: 2022/11/28 计量规程文件替换接口 + + @ApiOperation("文件删除") @PostMapping("/delete") @ResponseBody diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml index 734f08e..706e7c8 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml @@ -54,7 +54,7 @@ mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department, mtsp.job, mtsp.phone FROM meter_trace_supplier mts - LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mts.supplier_id + LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mtsp.supplier_id WHERE mts.id = #{id} AND mts.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml index 7057751..27aef05 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml @@ -6,7 +6,7 @@ UPDATE meter_train_staff SET exam_result = #{item.examResult} - WHERE id = #{item.staffId} AND plan_id = #{item.planId} + WHERE staff_id = #{item.staffId} AND plan_id = #{item.planId} diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java new file mode 100644 index 0000000..810e3fd --- /dev/null +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java @@ -0,0 +1,32 @@ +package com.casic.missiles.job.handler; + +/** + * @Description: 计量文件JobHandler + * @Author: wangpeng + * @Date: 2022/11/29 14:22 + */ + +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; + +@Slf4j +@Component +public class FileJobHandler { + + /** + * 文件实施状态变更任务 + * @param param + * @return + * @throws Exception + */ + @XxlJob(value = "fileEffectiveStatusHandler") + public ReturnT execute(String param) throws Exception { + // TODO: 文件实施状态变更任务 + return SUCCESS; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java index 5fba4a1..82c56e5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java @@ -179,10 +179,10 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatusName; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java index 41862c9..54f5ad6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java @@ -13,68 +13,63 @@ @Data public class TrainLogAddRequest { /** - * 培训计录编号 - */ - private String logNo; - - /** * 填表人 */ - @ApiModelProperty(value = "填表人", dataType = "String") + @ApiModelProperty(value = "填表人", dataType = "String", required = true) private String preparer; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") + @ApiModelProperty(value = "培训计划表id", dataType = "String", required = true) private Long planId; /** * 培训名称 */ - @ApiModelProperty(value = "培训名称", dataType = "String") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) private String trainName; /** * 培训对象 */ - @ApiModelProperty(value = "培训对象", dataType = "String") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) private String trainPerson; /** * 培训人数 */ - @ApiModelProperty(value = "培训人数", dataType = "Integer") + @ApiModelProperty(value = "培训人数", dataType = "Integer", required = true) private Integer trainNumber; /** * 培训时间 */ - @ApiModelProperty(value = "培训时间", dataType = "String") + @ApiModelProperty(value = "培训时间", dataType = "String", required = true) private String trainTime; /** * 培训学时 */ - @ApiModelProperty(value = "培训学时", dataType = "String") + @ApiModelProperty(value = "培训学时", dataType = "String", required = true) private String trainHour; /** * 培训地点 */ - @ApiModelProperty(value = "培训地点", dataType = "String") + @ApiModelProperty(value = "培训地点", dataType = "String", required = true) private String trainAddress; /** * 培训内容 */ - @ApiModelProperty(value = "培训内容", dataType = "String") + @ApiModelProperty(value = "培训内容", dataType = "String", required = true) private String trainContent; /** * 培训效果 */ - @ApiModelProperty(value = "培训效果", dataType = "String") + @ApiModelProperty(value = "培训效果", dataType = "String", required = true) private String trainEffect; /** @@ -98,6 +93,6 @@ /** * 培训学员 */ - @ApiModelProperty(value = "培训学员列表", dataType = "List") + @ApiModelProperty(value = "培训学员列表", dataType = "List", required = true) private List trainStaffList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java index 30828d7..d4611bc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java @@ -15,14 +15,14 @@ /** * 计量人员表id */ - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + private Long staffId; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") - private String planId; + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + private Long planId; /** * 考核结果-存文字 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java index f7604a9..7c5fc6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java @@ -8,6 +8,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -33,7 +34,7 @@ * 组织部门id-系统组织表 */ @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotBlank(message = "系统组织部门id不能为空") + @NotNull(message = "系统组织部门id不能为空") @TableField("dept_id") private Long deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java index d994aeb..742c666 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java @@ -224,11 +224,11 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) @TableField("approval_status") private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value（列表接口返回参数）", dataType = "String") + @ApiModelProperty(hidden = true) @TableField(exist = false) private String approvalStatusName; @@ -256,7 +256,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java index 1b55c05..70c9e1f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java @@ -31,7 +31,7 @@ /** * 溯源供方表id */ - @ApiModelProperty(value = "溯源供方表id", dataType = "Long") + @ApiModelProperty(hidden = true) @TableField("supplier_id") private Long supplierId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java index 016b8be..5695eeb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java @@ -134,7 +134,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java index 3093e1c..8dfc613 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java @@ -125,11 +125,11 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) @TableField("approval_status") private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value（列表接口参数）", dataType = "String") + @ApiModelProperty(hidden = true) @TableField(exist = false) private String approvalStatusName; @@ -143,7 +143,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java index 8bc08bc..6ba44dd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -21,72 +22,84 @@ private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") @TableId("id") private Long id; /** * 计量人员表id */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) @TableField("staff_id") private Long staffId; /** * 培训计划表id */ + @ApiModelProperty(hidden = true) @TableField("plan_id") private Long planId; /** * 学员名称 */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) @TableField("name") private String name; /** * 单位名称-存文字 */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") @TableField("company") private String company; /** * 技术职称-存文字 */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") @TableField("technology_job") private String technologyJob; /** * 签到时间 */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") @TableField("sign_time") private String signTime; /** * 考核结果-存文字 */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") @TableField("exam_result") private String examResult; /** * 备注 */ + @ApiModelProperty(value = "备注", dataType = "String") @TableField("remark") private String remark; /** * 删除标记 */ + @ApiModelProperty(hidden = true) @TableField("is_del") private Integer isDel; /** * 创建时间 */ + @ApiModelProperty(hidden = true) @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(hidden = true) @TableField("update_time") private String updateTime; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java index d1b4a1b..f89d768 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java @@ -51,10 +51,10 @@ wrapper.like(StringUtils.isNotBlank(request.getFileCode()), "file_code", request.getFileCode()); wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType()); wrapper.like(!Objects.isNull(request.getEffectiveStatus()), "effective_status", request.getEffectiveStatus()); - wrapper.apply(StringUtils.isNotBlank(request.getPublishTime()), - "DATE_FORMAT(" + "'" + request.getPublishTime().split(" ")[0] + "'" + ",'%Y-%m-%d') >= DATE_FORMAT(publish_time,'%Y-%m-%d')"); + wrapper.apply(StringUtils.isNotBlank(request.getPublishTime()),//apply方法传入参数名不能为空 + "{0} >= DATE_FORMAT(publish_time,'%Y-%m-%d')", request.getPublishTime().split(" ")[0]); wrapper.apply(StringUtils.isNotBlank(request.getEffectiveTime()), - "DATE_FORMAT(" + "'" + request.getEffectiveTime().split(" ")[0] + "'" + ",'%Y-%m-%d') >= DATE_FORMAT(effective_time,'%Y-%m-%d')"); + "{0} >= DATE_FORMAT(effective_time,'%Y-%m-%d')", request.getEffectiveTime().split(" ")[0]); wrapper.eq("approval_status", ApprovalStatusEnum.PASSED.getCode()); //审批状态：已通过 wrapper.eq("is_del", 0); wrapper.orderByAsc("effective_status").orderByDesc("create_time"); @@ -76,7 +76,7 @@ // 启动文件审批流程 // activiti7中identityService被禁用了，无法使用identityService，只能在启动流程时添加流程变量 // variables.put("applyUser", purchase.getApplyer()); - file.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED.getValue()); //审批中状态 + file.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED.getCode()); //审批中状态 int row = meterFileMapper.insert(file); if(row <= 0){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterOrganizeServiceImpl.java index 1553705..fedd145 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterOrganizeServiceImpl.java @@ -99,6 +99,7 @@ meterOrganize.setOrganizeName(dept.getSimpleName()); meterOrganize.setOrganizeType(dept.getDeptType()); UpdateWrapper wrapper = new UpdateWrapper<>(); + //已删除数据mp该update方法无法更新 wrapper.eq("dept_id", dept.getId()); return organizeMapper.update(meterOrganize, wrapper); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTraceSupplierServiceImpl.java index c0a7996..4849f67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTraceSupplierServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.mapper.MeterTraceSupplierMapper; import com.casic.missiles.mapper.MeterTraceSupplierPersonMapper; import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.MeterTraceSupplierPerson; import com.casic.missiles.service.IMeterTraceSupplierPersonService; import com.casic.missiles.service.IMeterTraceSupplierService; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -50,6 +51,7 @@ wrapper.like(StringUtils.isNotBlank(request.getSupplierNo()), "supplier_no", request.getSupplierNo()); wrapper.like(StringUtils.isNotBlank(request.getSupplierName()), "supplier_name", request.getSupplierName()); wrapper.like(StringUtils.isNotBlank(request.getBusinessContent()), "business_content", request.getBusinessContent()); + wrapper.eq("approval_status", ApprovalStatusEnum.PASSED.getCode()); //审批状态：已通过 wrapper.eq("is_del", 0); wrapper.orderByDesc("create_time"); Page traceSupplierPage = traceSupplierMapper.selectPage(page, wrapper); @@ -66,15 +68,19 @@ Long maxNo = traceSupplierMapper.selectMaxSupplierNo(); String supplierNo = NumberGeneratorUtil.getContactNo("sygf", maxNo); traceSupplier.setSupplierNo(supplierNo); - traceSupplier.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED.getValue()); //审批中状态 + traceSupplier.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED.getCode()); //审批中状态 int insertFlag = traceSupplierMapper.insert(traceSupplier); if(insertFlag <= 0){ return ReturnUtil.failed("新建失败"); } //存储溯源供方人员信息 boolean saveBatchFlag = true; - if(!CollectionUtils.isEmpty(traceSupplier.getTraceSupplierPersonList())){ - saveBatchFlag = traceSupplierPersonService.saveBatch(traceSupplier.getTraceSupplierPersonList()); + List traceSupplierPersonList = traceSupplier.getTraceSupplierPersonList(); + if(!CollectionUtils.isEmpty(traceSupplierPersonList)){ + traceSupplierPersonList.forEach(person -> { + person.setSupplierId(traceSupplier.getId()); + }); + saveBatchFlag = traceSupplierPersonService.saveBatch(traceSupplierPersonList); } //存储溯源供方业务记录 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java index 90272b4..4f5d319 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java @@ -56,7 +56,7 @@ /** * 文件新建、编辑（废止）、删除 * 流程：审批人列表要随着流程图信息一起上传 - * 前后端交互两种方案（待晓颖调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） + * 前后端交互两种方案（待前端调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） * 2、前端直接传bpmn文件或bpmn的xml文件（使用BpmnXMLConverter类的方法） * 文件的审批状态字段要更新，保证文件表的状态及时更新，供各列表使用 */ @@ -80,6 +80,12 @@ return meterFileService.updateFile(idDTO.getId()); } + /** + * 计量规程文件替换 + */ + // TODO: 2022/11/28 计量规程文件替换接口 + + @ApiOperation("文件删除") @PostMapping("/delete") @ResponseBody diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml index 734f08e..706e7c8 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml @@ -54,7 +54,7 @@ mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department, mtsp.job, mtsp.phone FROM meter_trace_supplier mts - LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mts.supplier_id + LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mtsp.supplier_id WHERE mts.id = #{id} AND mts.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml index 7057751..27aef05 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml @@ -6,7 +6,7 @@ UPDATE meter_train_staff SET exam_result = #{item.examResult} - WHERE id = #{item.staffId} AND plan_id = #{item.planId} + WHERE staff_id = #{item.staffId} AND plan_id = #{item.planId} diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java new file mode 100644 index 0000000..810e3fd --- /dev/null +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java @@ -0,0 +1,32 @@ +package com.casic.missiles.job.handler; + +/** + * @Description: 计量文件JobHandler + * @Author: wangpeng + * @Date: 2022/11/29 14:22 + */ + +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; + +@Slf4j +@Component +public class FileJobHandler { + + /** + * 文件实施状态变更任务 + * @param param + * @return + * @throws Exception + */ + @XxlJob(value = "fileEffectiveStatusHandler") + public ReturnT execute(String param) throws Exception { + // TODO: 文件实施状态变更任务 + return SUCCESS; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java index 5fba4a1..82c56e5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java @@ -179,10 +179,10 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatusName; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java index 41862c9..54f5ad6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java @@ -13,68 +13,63 @@ @Data public class TrainLogAddRequest { /** - * 培训计录编号 - */ - private String logNo; - - /** * 填表人 */ - @ApiModelProperty(value = "填表人", dataType = "String") + @ApiModelProperty(value = "填表人", dataType = "String", required = true) private String preparer; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") + @ApiModelProperty(value = "培训计划表id", dataType = "String", required = true) private Long planId; /** * 培训名称 */ - @ApiModelProperty(value = "培训名称", dataType = "String") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) private String trainName; /** * 培训对象 */ - @ApiModelProperty(value = "培训对象", dataType = "String") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) private String trainPerson; /** * 培训人数 */ - @ApiModelProperty(value = "培训人数", dataType = "Integer") + @ApiModelProperty(value = "培训人数", dataType = "Integer", required = true) private Integer trainNumber; /** * 培训时间 */ - @ApiModelProperty(value = "培训时间", dataType = "String") + @ApiModelProperty(value = "培训时间", dataType = "String", required = true) private String trainTime; /** * 培训学时 */ - @ApiModelProperty(value = "培训学时", dataType = "String") + @ApiModelProperty(value = "培训学时", dataType = "String", required = true) private String trainHour; /** * 培训地点 */ - @ApiModelProperty(value = "培训地点", dataType = "String") + @ApiModelProperty(value = "培训地点", dataType = "String", required = true) private String trainAddress; /** * 培训内容 */ - @ApiModelProperty(value = "培训内容", dataType = "String") + @ApiModelProperty(value = "培训内容", dataType = "String", required = true) private String trainContent; /** * 培训效果 */ - @ApiModelProperty(value = "培训效果", dataType = "String") + @ApiModelProperty(value = "培训效果", dataType = "String", required = true) private String trainEffect; /** @@ -98,6 +93,6 @@ /** * 培训学员 */ - @ApiModelProperty(value = "培训学员列表", dataType = "List") + @ApiModelProperty(value = "培训学员列表", dataType = "List", required = true) private List trainStaffList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java index 30828d7..d4611bc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java @@ -15,14 +15,14 @@ /** * 计量人员表id */ - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + private Long staffId; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") - private String planId; + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + private Long planId; /** * 考核结果-存文字 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java index f7604a9..7c5fc6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java @@ -8,6 +8,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -33,7 +34,7 @@ * 组织部门id-系统组织表 */ @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotBlank(message = "系统组织部门id不能为空") + @NotNull(message = "系统组织部门id不能为空") @TableField("dept_id") private Long deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java index d994aeb..742c666 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java @@ -224,11 +224,11 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) @TableField("approval_status") private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value（列表接口返回参数）", dataType = "String") + @ApiModelProperty(hidden = true) @TableField(exist = false) private String approvalStatusName; @@ -256,7 +256,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java index 1b55c05..70c9e1f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java @@ -31,7 +31,7 @@ /** * 溯源供方表id */ - @ApiModelProperty(value = "溯源供方表id", dataType = "Long") + @ApiModelProperty(hidden = true) @TableField("supplier_id") private Long supplierId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java index 016b8be..5695eeb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java @@ -134,7 +134,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java index 3093e1c..8dfc613 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java @@ -125,11 +125,11 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) @TableField("approval_status") private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value（列表接口参数）", dataType = "String") + @ApiModelProperty(hidden = true) @TableField(exist = false) private String approvalStatusName; @@ -143,7 +143,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java index 8bc08bc..6ba44dd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -21,72 +22,84 @@ private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") @TableId("id") private Long id; /** * 计量人员表id */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) @TableField("staff_id") private Long staffId; /** * 培训计划表id */ + @ApiModelProperty(hidden = true) @TableField("plan_id") private Long planId; /** * 学员名称 */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) @TableField("name") private String name; /** * 单位名称-存文字 */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") @TableField("company") private String company; /** * 技术职称-存文字 */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") @TableField("technology_job") private String technologyJob; /** * 签到时间 */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") @TableField("sign_time") private String signTime; /** * 考核结果-存文字 */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") @TableField("exam_result") private String examResult; /** * 备注 */ + @ApiModelProperty(value = "备注", dataType = "String") @TableField("remark") private String remark; /** * 删除标记 */ + @ApiModelProperty(hidden = true) @TableField("is_del") private Integer isDel; /** * 创建时间 */ + @ApiModelProperty(hidden = true) @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(hidden = true) @TableField("update_time") private String updateTime; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java index d1b4a1b..f89d768 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java @@ -51,10 +51,10 @@ wrapper.like(StringUtils.isNotBlank(request.getFileCode()), "file_code", request.getFileCode()); wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType()); wrapper.like(!Objects.isNull(request.getEffectiveStatus()), "effective_status", request.getEffectiveStatus()); - wrapper.apply(StringUtils.isNotBlank(request.getPublishTime()), - "DATE_FORMAT(" + "'" + request.getPublishTime().split(" ")[0] + "'" + ",'%Y-%m-%d') >= DATE_FORMAT(publish_time,'%Y-%m-%d')"); + wrapper.apply(StringUtils.isNotBlank(request.getPublishTime()),//apply方法传入参数名不能为空 + "{0} >= DATE_FORMAT(publish_time,'%Y-%m-%d')", request.getPublishTime().split(" ")[0]); wrapper.apply(StringUtils.isNotBlank(request.getEffectiveTime()), - "DATE_FORMAT(" + "'" + request.getEffectiveTime().split(" ")[0] + "'" + ",'%Y-%m-%d') >= DATE_FORMAT(effective_time,'%Y-%m-%d')"); + "{0} >= DATE_FORMAT(effective_time,'%Y-%m-%d')", request.getEffectiveTime().split(" ")[0]); wrapper.eq("approval_status", ApprovalStatusEnum.PASSED.getCode()); //审批状态：已通过 wrapper.eq("is_del", 0); wrapper.orderByAsc("effective_status").orderByDesc("create_time"); @@ -76,7 +76,7 @@ // 启动文件审批流程 // activiti7中identityService被禁用了，无法使用identityService，只能在启动流程时添加流程变量 // variables.put("applyUser", purchase.getApplyer()); - file.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED.getValue()); //审批中状态 + file.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED.getCode()); //审批中状态 int row = meterFileMapper.insert(file); if(row <= 0){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterOrganizeServiceImpl.java index 1553705..fedd145 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterOrganizeServiceImpl.java @@ -99,6 +99,7 @@ meterOrganize.setOrganizeName(dept.getSimpleName()); meterOrganize.setOrganizeType(dept.getDeptType()); UpdateWrapper wrapper = new UpdateWrapper<>(); + //已删除数据mp该update方法无法更新 wrapper.eq("dept_id", dept.getId()); return organizeMapper.update(meterOrganize, wrapper); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTraceSupplierServiceImpl.java index c0a7996..4849f67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTraceSupplierServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.mapper.MeterTraceSupplierMapper; import com.casic.missiles.mapper.MeterTraceSupplierPersonMapper; import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.MeterTraceSupplierPerson; import com.casic.missiles.service.IMeterTraceSupplierPersonService; import com.casic.missiles.service.IMeterTraceSupplierService; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -50,6 +51,7 @@ wrapper.like(StringUtils.isNotBlank(request.getSupplierNo()), "supplier_no", request.getSupplierNo()); wrapper.like(StringUtils.isNotBlank(request.getSupplierName()), "supplier_name", request.getSupplierName()); wrapper.like(StringUtils.isNotBlank(request.getBusinessContent()), "business_content", request.getBusinessContent()); + wrapper.eq("approval_status", ApprovalStatusEnum.PASSED.getCode()); //审批状态：已通过 wrapper.eq("is_del", 0); wrapper.orderByDesc("create_time"); Page traceSupplierPage = traceSupplierMapper.selectPage(page, wrapper); @@ -66,15 +68,19 @@ Long maxNo = traceSupplierMapper.selectMaxSupplierNo(); String supplierNo = NumberGeneratorUtil.getContactNo("sygf", maxNo); traceSupplier.setSupplierNo(supplierNo); - traceSupplier.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED.getValue()); //审批中状态 + traceSupplier.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED.getCode()); //审批中状态 int insertFlag = traceSupplierMapper.insert(traceSupplier); if(insertFlag <= 0){ return ReturnUtil.failed("新建失败"); } //存储溯源供方人员信息 boolean saveBatchFlag = true; - if(!CollectionUtils.isEmpty(traceSupplier.getTraceSupplierPersonList())){ - saveBatchFlag = traceSupplierPersonService.saveBatch(traceSupplier.getTraceSupplierPersonList()); + List traceSupplierPersonList = traceSupplier.getTraceSupplierPersonList(); + if(!CollectionUtils.isEmpty(traceSupplierPersonList)){ + traceSupplierPersonList.forEach(person -> { + person.setSupplierId(traceSupplier.getId()); + }); + saveBatchFlag = traceSupplierPersonService.saveBatch(traceSupplierPersonList); } //存储溯源供方业务记录 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTrainLogServiceImpl.java index 3cd9a9f..5809aa0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTrainLogServiceImpl.java @@ -43,7 +43,7 @@ wrapper.apply(StringUtils.isNotBlank(request.getTrainTime()), "{0} >= DATE_FORMAT(train_time,'%Y-%m-%d')", request.getTrainTime().split(" ")[0]); wrapper.apply(StringUtils.isNotBlank(request.getCreateTime()), - "{0} >= DATE_FORMAT(effective_time,'%Y-%m-%d')", request.getCreateTime().split(" ")[0]); + "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTime().split(" ")[0]); wrapper.eq("is_del", 0); Page trainLogPage = trainLogMapper.selectPage(page, wrapper); return trainLogPage; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java index 90272b4..4f5d319 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterFileController.java @@ -56,7 +56,7 @@ /** * 文件新建、编辑（废止）、删除 * 流程：审批人列表要随着流程图信息一起上传 - * 前后端交互两种方案（待晓颖调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） + * 前后端交互两种方案（待前端调研）：1、前端传和activiti流程图生成的json一样的json，后端转成bpmnModel（使用BpmnJsonConverter类的方法） * 2、前端直接传bpmn文件或bpmn的xml文件（使用BpmnXMLConverter类的方法） * 文件的审批状态字段要更新，保证文件表的状态及时更新，供各列表使用 */ @@ -80,6 +80,12 @@ return meterFileService.updateFile(idDTO.getId()); } + /** + * 计量规程文件替换 + */ + // TODO: 2022/11/28 计量规程文件替换接口 + + @ApiOperation("文件删除") @PostMapping("/delete") @ResponseBody diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml index 734f08e..706e7c8 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTraceSupplierMapper.xml @@ -54,7 +54,7 @@ mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department, mtsp.job, mtsp.phone FROM meter_trace_supplier mts - LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mts.supplier_id + LEFT JOIN meter_trace_supplier_person mtsp ON mts.id = mtsp.supplier_id WHERE mts.id = #{id} AND mts.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml index 7057751..27aef05 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterTrainStaffMapper.xml @@ -6,7 +6,7 @@ UPDATE meter_train_staff SET exam_result = #{item.examResult} - WHERE id = #{item.staffId} AND plan_id = #{item.planId} + WHERE staff_id = #{item.staffId} AND plan_id = #{item.planId} diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java new file mode 100644 index 0000000..810e3fd --- /dev/null +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/FileJobHandler.java @@ -0,0 +1,32 @@ +package com.casic.missiles.job.handler; + +/** + * @Description: 计量文件JobHandler + * @Author: wangpeng + * @Date: 2022/11/29 14:22 + */ + +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; + +@Slf4j +@Component +public class FileJobHandler { + + /** + * 文件实施状态变更任务 + * @param param + * @return + * @throws Exception + */ + @XxlJob(value = "fileEffectiveStatusHandler") + public ReturnT execute(String param) throws Exception { + // TODO: 文件实施状态变更任务 + return SUCCESS; + } + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java index 5fba4a1..82c56e5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java @@ -179,10 +179,10 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value", dataType = "String") + @ApiModelProperty(hidden = true) private String approvalStatusName; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java index 41862c9..54f5ad6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainLogAddRequest.java @@ -13,68 +13,63 @@ @Data public class TrainLogAddRequest { /** - * 培训计录编号 - */ - private String logNo; - - /** * 填表人 */ - @ApiModelProperty(value = "填表人", dataType = "String") + @ApiModelProperty(value = "填表人", dataType = "String", required = true) private String preparer; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") + @ApiModelProperty(value = "培训计划表id", dataType = "String", required = true) private Long planId; /** * 培训名称 */ - @ApiModelProperty(value = "培训名称", dataType = "String") + @ApiModelProperty(value = "培训名称", dataType = "String", required = true) private String trainName; /** * 培训对象 */ - @ApiModelProperty(value = "培训对象", dataType = "String") + @ApiModelProperty(value = "培训对象", dataType = "String", required = true) private String trainPerson; /** * 培训人数 */ - @ApiModelProperty(value = "培训人数", dataType = "Integer") + @ApiModelProperty(value = "培训人数", dataType = "Integer", required = true) private Integer trainNumber; /** * 培训时间 */ - @ApiModelProperty(value = "培训时间", dataType = "String") + @ApiModelProperty(value = "培训时间", dataType = "String", required = true) private String trainTime; /** * 培训学时 */ - @ApiModelProperty(value = "培训学时", dataType = "String") + @ApiModelProperty(value = "培训学时", dataType = "String", required = true) private String trainHour; /** * 培训地点 */ - @ApiModelProperty(value = "培训地点", dataType = "String") + @ApiModelProperty(value = "培训地点", dataType = "String", required = true) private String trainAddress; /** * 培训内容 */ - @ApiModelProperty(value = "培训内容", dataType = "String") + @ApiModelProperty(value = "培训内容", dataType = "String", required = true) private String trainContent; /** * 培训效果 */ - @ApiModelProperty(value = "培训效果", dataType = "String") + @ApiModelProperty(value = "培训效果", dataType = "String", required = true) private String trainEffect; /** @@ -98,6 +93,6 @@ /** * 培训学员 */ - @ApiModelProperty(value = "培训学员列表", dataType = "List") + @ApiModelProperty(value = "培训学员列表", dataType = "List", required = true) private List trainStaffList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java index 30828d7..d4611bc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainStaffExamDTO.java @@ -15,14 +15,14 @@ /** * 计量人员表id */ - @ApiModelProperty(value = "计量人员表id", dataType = "String") - private String staffId; + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) + private Long staffId; /** * 培训计划表id */ - @ApiModelProperty(value = "培训计划表id", dataType = "String") - private String planId; + @ApiModelProperty(value = "培训计划表id", dataType = "Long") + private Long planId; /** * 考核结果-存文字 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java index f7604a9..7c5fc6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterOrganize.java @@ -8,6 +8,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -33,7 +34,7 @@ * 组织部门id-系统组织表 */ @ApiModelProperty(value = "组织部门id", dataType = "Long", required = true) - @NotBlank(message = "系统组织部门id不能为空") + @NotNull(message = "系统组织部门id不能为空") @TableField("dept_id") private Long deptId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java index d994aeb..742c666 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java @@ -224,11 +224,11 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) @TableField("approval_status") private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value（列表接口返回参数）", dataType = "String") + @ApiModelProperty(hidden = true) @TableField(exist = false) private String approvalStatusName; @@ -256,7 +256,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java index 1b55c05..70c9e1f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplierPerson.java @@ -31,7 +31,7 @@ /** * 溯源供方表id */ - @ApiModelProperty(value = "溯源供方表id", dataType = "Long") + @ApiModelProperty(hidden = true) @TableField("supplier_id") private Long supplierId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java index 016b8be..5695eeb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainLog.java @@ -134,7 +134,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java index 3093e1c..8dfc613 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainPlan.java @@ -125,11 +125,11 @@ /** * 审批状态-字典code */ - @ApiModelProperty(value = "审批状态-字典code", dataType = "String") + @ApiModelProperty(hidden = true) @TableField("approval_status") private String approvalStatus; - @ApiModelProperty(value = "审批状态-字典value（列表接口参数）", dataType = "String") + @ApiModelProperty(hidden = true) @TableField(exist = false) private String approvalStatusName; @@ -143,7 +143,7 @@ /** * 创建时间 */ - @ApiModelProperty(value = "创建时间", dataType = "String") + @ApiModelProperty(value = "创建时间（列表接口参数）", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java index 8bc08bc..6ba44dd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTrainStaff.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -21,72 +22,84 @@ private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "主键id（列表、更新接口参数）", dataType = "Long") @TableId("id") private Long id; /** * 计量人员表id */ + @ApiModelProperty(value = "计量人员表id", dataType = "Long", required = true) @TableField("staff_id") private Long staffId; /** * 培训计划表id */ + @ApiModelProperty(hidden = true) @TableField("plan_id") private Long planId; /** * 学员名称 */ + @ApiModelProperty(value = "学员名称", dataType = "String", required = true) @TableField("name") private String name; /** * 单位名称-存文字 */ + @ApiModelProperty(value = "单位名称-存文字", dataType = "String") @TableField("company") private String company; /** * 技术职称-存文字 */ + @ApiModelProperty(value = "技术职称-存文字", dataType = "String") @TableField("technology_job") private String technologyJob; /** * 签到时间 */ + @ApiModelProperty(value = "签到时间（培训记录接口参数）", dataType = "String") @TableField("sign_time") private String signTime; /** * 考核结果-存文字 */ + @ApiModelProperty(value = "考核结果-存文字", dataType = "String") @TableField("exam_result") private String examResult; /** * 备注 */ + @ApiModelProperty(value = "备注", dataType = "String") @TableField("remark") private String remark; /** * 删除标记 */ + @ApiModelProperty(hidden = true) @TableField("is_del") private Integer isDel; /** * 创建时间 */ + @ApiModelProperty(hidden = true) @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(hidden = true) @TableField("update_time") private String updateTime; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java index d1b4a1b..f89d768 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterFileServiceImpl.java @@ -51,10 +51,10 @@ wrapper.like(StringUtils.isNotBlank(request.getFileCode()), "file_code", request.getFileCode()); wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType()); wrapper.like(!Objects.isNull(request.getEffectiveStatus()), "effective_status", request.getEffectiveStatus()); - wrapper.apply(StringUtils.isNotBlank(request.getPublishTime()), - "DATE_FORMAT(" + "'" + request.getPublishTime().split(" ")[0] + "'" + ",'%Y-%m-%d') >= DATE_FORMAT(publish_time,'%Y-%m-%d')"); + wrapper.apply(StringUtils.isNotBlank(request.getPublishTime()),//apply方法传入参数名不能为空 + "{0} >= DATE_FORMAT(publish_time,'%Y-%m-%d')", request.getPublishTime().split(" ")[0]); wrapper.apply(StringUtils.isNotBlank(request.getEffectiveTime()), - "DATE_FORMAT(" + "'" + request.getEffectiveTime().split(" ")[0] + "'" + ",'%Y-%m-%d') >= DATE_FORMAT(effective_time,'%Y-%m-%d')"); + "{0} >= DATE_FORMAT(effective_time,'%Y-%m-%d')", request.getEffectiveTime().split(" ")[0]); wrapper.eq("approval_status", ApprovalStatusEnum.PASSED.getCode()); //审批状态：已通过 wrapper.eq("is_del", 0); wrapper.orderByAsc("effective_status").orderByDesc("create_time"); @@ -76,7 +76,7 @@ // 启动文件审批流程 // activiti7中identityService被禁用了，无法使用identityService，只能在启动流程时添加流程变量 // variables.put("applyUser", purchase.getApplyer()); - file.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED.getValue()); //审批中状态 + file.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED.getCode()); //审批中状态 int row = meterFileMapper.insert(file); if(row <= 0){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterOrganizeServiceImpl.java index 1553705..fedd145 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterOrganizeServiceImpl.java @@ -99,6 +99,7 @@ meterOrganize.setOrganizeName(dept.getSimpleName()); meterOrganize.setOrganizeType(dept.getDeptType()); UpdateWrapper wrapper = new UpdateWrapper<>(); + //已删除数据mp该update方法无法更新 wrapper.eq("dept_id", dept.getId()); return organizeMapper.update(meterOrganize, wrapper); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTraceSupplierServiceImpl.java index c0a7996..4849f67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTraceSupplierServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.mapper.MeterTraceSupplierMapper; import com.casic.missiles.mapper.MeterTraceSupplierPersonMapper; import com.casic.missiles.model.MeterTraceSupplier; +import com.casic.missiles.model.MeterTraceSupplierPerson; import com.casic.missiles.service.IMeterTraceSupplierPersonService; import com.casic.missiles.service.IMeterTraceSupplierService; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -50,6 +51,7 @@ wrapper.like(StringUtils.isNotBlank(request.getSupplierNo()), "supplier_no", request.getSupplierNo()); wrapper.like(StringUtils.isNotBlank(request.getSupplierName()), "supplier_name", request.getSupplierName()); wrapper.like(StringUtils.isNotBlank(request.getBusinessContent()), "business_content", request.getBusinessContent()); + wrapper.eq("approval_status", ApprovalStatusEnum.PASSED.getCode()); //审批状态：已通过 wrapper.eq("is_del", 0); wrapper.orderByDesc("create_time"); Page traceSupplierPage = traceSupplierMapper.selectPage(page, wrapper); @@ -66,15 +68,19 @@ Long maxNo = traceSupplierMapper.selectMaxSupplierNo(); String supplierNo = NumberGeneratorUtil.getContactNo("sygf", maxNo); traceSupplier.setSupplierNo(supplierNo); - traceSupplier.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED.getValue()); //审批中状态 + traceSupplier.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED.getCode()); //审批中状态 int insertFlag = traceSupplierMapper.insert(traceSupplier); if(insertFlag <= 0){ return ReturnUtil.failed("新建失败"); } //存储溯源供方人员信息 boolean saveBatchFlag = true; - if(!CollectionUtils.isEmpty(traceSupplier.getTraceSupplierPersonList())){ - saveBatchFlag = traceSupplierPersonService.saveBatch(traceSupplier.getTraceSupplierPersonList()); + List traceSupplierPersonList = traceSupplier.getTraceSupplierPersonList(); + if(!CollectionUtils.isEmpty(traceSupplierPersonList)){ + traceSupplierPersonList.forEach(person -> { + person.setSupplierId(traceSupplier.getId()); + }); + saveBatchFlag = traceSupplierPersonService.saveBatch(traceSupplierPersonList); } //存储溯源供方业务记录 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTrainLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTrainLogServiceImpl.java index 3cd9a9f..5809aa0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTrainLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTrainLogServiceImpl.java @@ -43,7 +43,7 @@ wrapper.apply(StringUtils.isNotBlank(request.getTrainTime()), "{0} >= DATE_FORMAT(train_time,'%Y-%m-%d')", request.getTrainTime().split(" ")[0]); wrapper.apply(StringUtils.isNotBlank(request.getCreateTime()), - "{0} >= DATE_FORMAT(effective_time,'%Y-%m-%d')", request.getCreateTime().split(" ")[0]); + "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTime().split(" ")[0]); wrapper.eq("is_del", 0); Page trainLogPage = trainLogMapper.selectPage(page, wrapper); return trainLogPage; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTrainPlanServiceImpl.java index 233e902..faa71b4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterTrainPlanServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.mapper.MeterTrainPlanMapper; import com.casic.missiles.mapper.MeterTrainStaffMapper; import com.casic.missiles.model.MeterTrainPlan; +import com.casic.missiles.model.MeterTrainStaff; import com.casic.missiles.service.IMeterTrainPlanService; import com.casic.missiles.service.IMeterTrainStaffService; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -54,9 +55,10 @@ wrapper.apply(StringUtils.isNotBlank(request.getTrainTime()), "{0} >= DATE_FORMAT(train_time,'%Y-%m-%d')", request.getTrainTime().split(" ")[0]); wrapper.apply(StringUtils.isNotBlank(request.getCreateTime()), - "{0} >= DATE_FORMAT(effective_time,'%Y-%m-%d')", request.getCreateTime().split(" ")[0]); + "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTime().split(" ")[0]); + wrapper.eq("approval_status", ApprovalStatusEnum.PASSED.getCode()); //审批状态：已通过 wrapper.eq("is_del", 0); - wrapper.orderByDesc("effective_time").orderByDesc("create_time"); + wrapper.orderByDesc("train_time").orderByDesc("create_time"); Page trainPlanPage = trainPlanMapper.selectPage(page, wrapper); trainPlanPage.getRecords().stream().forEach(result -> { result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, result.getApprovalStatus())); @@ -71,15 +73,19 @@ Long maxNo = trainPlanMapper.selectMaxTrainPlanNo(); String planNo = NumberGeneratorUtil.getContactNo("pxjh", maxNo); meterTrainPlan.setPlanNo(planNo); - meterTrainPlan.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED.getValue()); //审批中状态 + meterTrainPlan.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED.getCode()); //审批中状态 int row = trainPlanMapper.insert(meterTrainPlan); if(row <= 0){ return ReturnUtil.failed("新建失败"); } //存储溯源供方人员信息 boolean saveBatchFlag = true; - if(!CollectionUtils.isEmpty(meterTrainPlan.getTrainPlanList())){ - saveBatchFlag = trainStaffService.saveBatch(meterTrainPlan.getTrainPlanList()); + List trainPlanStaffList = meterTrainPlan.getTrainPlanList(); + if(!CollectionUtils.isEmpty(trainPlanStaffList)){ + trainPlanStaffList.forEach(person -> { + person.setStaffId(meterTrainPlan.getId()); + }); + saveBatchFlag = trainStaffService.saveBatch(trainPlanStaffList); } // // 启动文件审批流程