diff --git a/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java b/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java index 814bf48f..74168d4b 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java @@ -84,8 +84,13 @@ public enum HandleEnum { PROD_READY_TASK_DETAIL("ProdReadyTaskDetailBO", "ProdReadyTaskDetailBO:{0},{1}"), /**设备检验任务的检验项**/ - RESOURCE_INSPECT_TASK_PARAM("ResourceInspectTaskParamBo","ResourceInspectTaskParamBo:{0},{1}"); + RESOURCE_INSPECT_TASK_PARAM("ResourceInspectTaskParamBo","ResourceInspectTaskParamBo:{0},{1}"), + /**设备检验任务的检验项**/ + RESOURCE_INSPECT_TASK_SPARE("ResourceInspectTaskSpareBo","ResourceInspectTaskSpareBo:{0},{1}"), + + /**用户**/ + USR("UserBo","UserBo:{0},{1}"); private String prefix; diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskController.java index c34fc641..66a458a9 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskController.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskController.java @@ -1,5 +1,7 @@ package com.foreverwin.mesnac.equip.controller; +import com.foreverwin.mesnac.common.enums.HandleEnum; +import com.foreverwin.mesnac.equip.dto.ResourceInspectTaskDto; import com.foreverwin.modular.core.util.R; import com.foreverwin.modular.core.util.FrontPage; import com.foreverwin.modular.core.util.CommonMethods; @@ -11,12 +13,14 @@ import org.springframework.web.bind.annotation.*; import com.foreverwin.mesnac.equip.service.ResourceInspectTaskService; import com.foreverwin.mesnac.equip.model.ResourceInspectTask; + +import java.time.LocalDateTime; import java.util.List; /** * * @author pavel.Liu - * @since 2021-06-24 + * @since 2021-07-01 */ @RestController @RequestMapping("/Z-RESOURCE-INSPECT-TASK") @@ -45,7 +49,11 @@ public class ResourceInspectTaskController { @ResponseBody @GetMapping("") public R getResourceInspectTaskList(ResourceInspectTask resourceInspectTask){ - return R.ok(resourceInspectTaskService.selectList(resourceInspectTask)); + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectTask); + result = resourceInspectTaskService.list(queryWrapper); + return R.ok(result); } /** @@ -72,9 +80,10 @@ public class ResourceInspectTaskController { .or().like(ResourceInspectTask::getResourceInspectPlanBo, frontPage.getGlobalQuery()) .or().like(ResourceInspectTask::getInspectionItemBo, frontPage.getGlobalQuery()) .or().like(ResourceInspectTask::getResourceBo, frontPage.getGlobalQuery()) - .or().like(ResourceInspectTask::getResult, frontPage.getGlobalQuery()) .or().like(ResourceInspectTask::getExecutor, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTask::getResult, frontPage.getGlobalQuery()) .or().like(ResourceInspectTask::getRemark, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTask::getReason, frontPage.getGlobalQuery()) .or().like(ResourceInspectTask::getCreateUser, frontPage.getGlobalQuery()) .or().like(ResourceInspectTask::getModifyUser, frontPage.getGlobalQuery()) ); @@ -125,11 +134,94 @@ public class ResourceInspectTaskController { return R.ok(resourceInspectTaskService.removeByIds(ids)); } + /** + * 模糊查询检验任务 + * @param resourceInspectTaskDto + * @return + */ + @ResponseBody + @GetMapping("/findResourceInspectTaskList") + public R findResourceInspectTaskList(ResourceInspectTaskDto resourceInspectTaskDto){ + String site = CommonMethods.getSite(); + String planNo = resourceInspectTaskDto.getPlanNo(); + String resourceNo = resourceInspectTaskDto.getResourceNo(); + String resourceTypeNo = resourceInspectTaskDto.getResourceTypeNo(); + if (planNo != null){ + resourceInspectTaskDto.setResourceInspectPlanBo(HandleEnum.RESOURCE_INSPECT_PLAN.getHandle(site,planNo)); + } + if (resourceNo != null){ + resourceInspectTaskDto.setResourceBo(HandleEnum.RESOURCE.getHandle(site,resourceNo)); + } + if (resourceTypeNo != null){ + resourceInspectTaskDto.setResourceTypeBo(HandleEnum.RESOURCE_TYPE.getHandle(site,resourceTypeNo)); + } + return R.ok(resourceInspectTaskService.findResourceInspectTaskList(resourceInspectTaskDto)); + } + + + /** + * 任务总览下：点击任务 + * 1、非新建任务，直接返回数据 + * 2、新建任务，需比对检验项清单HANDLE，并创建检验项明细 + * @param resourceInspectTask + * @return + */ + @ResponseBody + @GetMapping("/getAndCreateTaskParamList") + public R getOrCreateTaskParamList(ResourceInspectTask resourceInspectTask){ + ResourceInspectTask inspectTask; + try { + inspectTask = resourceInspectTaskService.getResourceInspectTaskAll(resourceInspectTask); + }catch (Exception e){ + return R.failed("获取数据失败" + e.getMessage()); + } + return R.ok(inspectTask); + } + + /** + * 任务执行：点击开始执行，仅修改任务状态，并绑定执行人 + * @param taskNo + * @return + */ @ResponseBody - @GetMapping("/selectResourceInspectTaskList") - public R selectResourceInspectTaskList(ResourceInspectTask resourceInspectTask){ - return R.ok(resourceInspectTaskService.selectList(resourceInspectTask)); + @GetMapping("/startAndUpdateTask") + public R startAndUpdateTask(String taskNo){ + String handle = HandleEnum.RESOURCE_INSPECT_TASK.getHandle(CommonMethods.getSite(), taskNo); + ResourceInspectTask task = resourceInspectTaskService.getById(handle); + task.setStatus("501"); + task.setActualStartDate(LocalDateTime.now()); + task.setExecutor(CommonMethods.getUser()); + // 保存的数据：id或者handle？？？ + //task.setExecutor(CommonMethods.getUser()); + try { + resourceInspectTaskService.saveOrUpdate(task); + }catch (Exception e){ + return R.failed("数据更新失败，开始执行异常" + e.getMessage()); + } + return R.ok(task); } + /*** + * 任务执行，状态为处理中/执行中时，点击保存、完成执行按钮： + * 1、仅保存数据 + * 2、完成，保存数据 + * @param + * @return + */ + + @PostMapping ("/saveOrUpdateTaskInfo") + public R saveOrUpdateTaskInfo(@RequestBody ResourceInspectTaskDto resourceInspectTaskDto){ + String user = CommonMethods.getUser(); + String executor = resourceInspectTaskDto.getExecutor(); + if (user.equals(executor)){ + try { + resourceInspectTaskService.saveOrUpdateTaskInfo(resourceInspectTaskDto); + }catch (Exception e){ + return R.failed("数据保存失败" + e.getMessage()); + } + return R.ok(); + } + return R.failed("当前操作用户与执行人不一致，无法保存！！！"); + } } \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskParamController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskParamController.java index 254c7b2b..fb097aba 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskParamController.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskParamController.java @@ -16,7 +16,7 @@ import java.util.List; /** * * @author pavel.Liu - * @since 2021-06-10 + * @since 2021-07-01 */ @RestController @RequestMapping("/Z-RESOURCE-INSPECT-TASK-PARAM") @@ -68,17 +68,16 @@ public class ResourceInspectTaskParamController { //TODO modify global query queryWrapper.lambda().and(wrapper -> wrapper .like(ResourceInspectTaskParam::getHandle, frontPage.getGlobalQuery()) - .or().like(ResourceInspectTaskParam::getResourceInspectTaskBo, frontPage.getGlobalQuery()) - .or().like(ResourceInspectTaskParam::getResourceBo, frontPage.getGlobalQuery()) .or().like(ResourceInspectTaskParam::getInspectNo, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskParam::getResourceInspectTaskBo, frontPage.getGlobalQuery()) .or().like(ResourceInspectTaskParam::getDescription, frontPage.getGlobalQuery()) .or().like(ResourceInspectTaskParam::getInspectMethod, frontPage.getGlobalQuery()) .or().like(ResourceInspectTaskParam::getInspectDataType, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskParam::getParamUnit, frontPage.getGlobalQuery()) .or().like(ResourceInspectTaskParam::getRequired, frontPage.getGlobalQuery()) .or().like(ResourceInspectTaskParam::getStandardValue, frontPage.getGlobalQuery()) - .or().like(ResourceInspectTaskParam::getResrceValue, frontPage.getGlobalQuery()) - .or().like(ResourceInspectTaskParam::getParamUnit, frontPage.getGlobalQuery()) - .or().like(ResourceInspectTaskParam::getResrce, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskParam::getResultValue, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskParam::getResult, frontPage.getGlobalQuery()) .or().like(ResourceInspectTaskParam::getRemark, frontPage.getGlobalQuery()) .or().like(ResourceInspectTaskParam::getCreateUser, frontPage.getGlobalQuery()) .or().like(ResourceInspectTaskParam::getModifyUser, frontPage.getGlobalQuery()) diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskSpareController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskSpareController.java new file mode 100644 index 00000000..4a94ea27 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskSpareController.java @@ -0,0 +1,126 @@ +package com.foreverwin.mesnac.equip.controller; + +import com.foreverwin.modular.core.util.R; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.CommonMethods; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.foreverwin.mesnac.equip.service.ResourceInspectTaskSpareService; +import com.foreverwin.mesnac.equip.model.ResourceInspectTaskSpare; +import java.util.List; + +/** + * + * @author pavel.Liu + * @since 2021-07-01 + */ +@RestController +@RequestMapping("/Z-RESOURCE-INSPECT-TASK-SPARE") +public class ResourceInspectTaskSpareController { + + @Autowired + public ResourceInspectTaskSpareService resourceInspectTaskSpareService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getResourceInspectTaskSpareById(@PathVariable String id) { + return R.ok( resourceInspectTaskSpareService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getResourceInspectTaskSpareList(ResourceInspectTaskSpare resourceInspectTaskSpare){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectTaskSpare); + result = resourceInspectTaskSpareService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, ResourceInspectTaskSpare resourceInspectTaskSpare){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectTaskSpare); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(ResourceInspectTaskSpare::getHandle, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskSpare::getSpareNo, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskSpare::getResourceInspectTaskBo, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskSpare::getItemBo, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskSpare::getDescription, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskSpare::getUnit, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskSpare::getRemark, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskSpare::getCreateUser, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskSpare::getModifyUser, frontPage.getGlobalQuery()) + ); + } + result = resourceInspectTaskSpareService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param resourceInspectTaskSpare 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody ResourceInspectTaskSpare resourceInspectTaskSpare) { + return R.ok(resourceInspectTaskSpareService.save(resourceInspectTaskSpare)); + } + + /** + * 修改 + * @param resourceInspectTaskSpare 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody ResourceInspectTaskSpare resourceInspectTaskSpare) { + return R.ok(resourceInspectTaskSpareService.updateById(resourceInspectTaskSpare)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(resourceInspectTaskSpareService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(resourceInspectTaskSpareService.removeByIds(ids)); + } +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskMapper.java b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskMapper.java index 00800775..961a746a 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskMapper.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskMapper.java @@ -1,18 +1,27 @@ package com.foreverwin.mesnac.equip.mapper; +import com.foreverwin.mesnac.equip.dto.ResourceInspectTaskDto; import com.foreverwin.mesnac.equip.model.ResourceInspectTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springframework.stereotype.Repository; +import java.util.List; + /** *

* 设备检验任务表 Mapper 接口 *

* * @author pavel.Liu - * @since 2021-06-24 + * @since 2021-07-01 */ @Repository public interface ResourceInspectTaskMapper extends BaseMapper { + /** + * 自定义方法：查询检验任务---检验任务总览 + * @param resourceInspectTaskDto + * @return + */ + List findResourceInspectTaskList(ResourceInspectTaskDto resourceInspectTaskDto); } \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskParamMapper.java b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskParamMapper.java index 7f860924..bbabdd16 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskParamMapper.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskParamMapper.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; *

* * @author pavel.Liu - * @since 2021-06-10 + * @since 2021-07-01 */ @Repository public interface ResourceInspectTaskParamMapper extends BaseMapper { diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskSpareMapper.java b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskSpareMapper.java new file mode 100644 index 00000000..28d6b742 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskSpareMapper.java @@ -0,0 +1,18 @@ +package com.foreverwin.mesnac.equip.mapper; + +import com.foreverwin.mesnac.equip.model.ResourceInspectTaskSpare; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 设备检验任务-备品表 Mapper 接口 + *

+ * + * @author pavel.Liu + * @since 2021-07-01 + */ +@Repository +public interface ResourceInspectTaskSpareMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectTask.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectTask.java index f847f439..fa369638 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectTask.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectTask.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; +import java.util.List; + import com.baomidou.mybatisplus.annotation.IdType; /** @@ -16,7 +18,7 @@ import com.baomidou.mybatisplus.annotation.IdType; *

* * @author pavel.Liu - * @since 2021-06-24 + * @since 2021-07-01 */ @TableName("Z_RESOURCE_INSPECT_TASK") @@ -70,11 +72,6 @@ public class ResourceInspectTask extends Model { */ @TableField("RESOURCE_BO") private String resourceBo; - /** - * 检验结果 - */ - @TableField("RESULT") - private String result; /** * 任务创建时间 */ @@ -105,11 +102,21 @@ public class ResourceInspectTask extends Model { */ @TableField("EXECUTOR") private String executor; + /** + * 检验结果 + */ + @TableField("RESULT") + private String result; /** * 备注 */ @TableField("REMARK") private String remark; + /** + * 取消原因 + */ + @TableField("REASON") + private String reason; /** * 创建人 */ @@ -131,6 +138,27 @@ public class ResourceInspectTask extends Model { @TableField("MODIFIED_DATE_TIME") private LocalDateTime modifiedDateTime; + @TableField(exist = false) + private List taskItemDetailList; + + @TableField(exist = false) + private List taskSpareList; + + public List getTaskItemDetailList() { + return taskItemDetailList; + } + + public void setTaskItemDetailList(List taskItemDetailList) { + this.taskItemDetailList = taskItemDetailList; + } + + public List getTaskSpareList() { + return taskSpareList; + } + + public void setTaskSpareList(List taskSpareList) { + this.taskSpareList = taskSpareList; + } public String getHandle() { return handle; @@ -204,14 +232,6 @@ public class ResourceInspectTask extends Model { this.resourceBo = resourceBo; } - public String getResult() { - return result; - } - - public void setResult(String result) { - this.result = result; - } - public LocalDateTime getTaskCreateDate() { return taskCreateDate; } @@ -260,6 +280,14 @@ public class ResourceInspectTask extends Model { this.executor = executor; } + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + public String getRemark() { return remark; } @@ -268,6 +296,14 @@ public class ResourceInspectTask extends Model { this.remark = remark; } + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason; + } + public String getCreateUser() { return createUser; } @@ -318,8 +354,6 @@ public static final String INSPECTION_ITEM_BO = "INSPECTION_ITEM_BO"; public static final String RESOURCE_BO = "RESOURCE_BO"; -public static final String RESULT = "RESULT"; - public static final String TASK_CREATE_DATE = "TASK_CREATE_DATE"; public static final String PLAN_START_DATE = "PLAN_START_DATE"; @@ -332,8 +366,12 @@ public static final String ACTUAL_COMPLETE_DATE = "ACTUAL_COMPLETE_DATE"; public static final String EXECUTOR = "EXECUTOR"; +public static final String RESULT = "RESULT"; + public static final String REMARK = "REMARK"; +public static final String REASON = "REASON"; + public static final String CREATE_USER = "CREATE_USER"; public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; @@ -360,14 +398,15 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; ", resourceInspectPlanBo = " + resourceInspectPlanBo + ", inspectionItemBo = " + inspectionItemBo + ", resourceBo = " + resourceBo + - ", result = " + result + ", taskCreateDate = " + taskCreateDate + ", planStartDate = " + planStartDate + ", planCompleteDate = " + planCompleteDate + ", actualStartDate = " + actualStartDate + ", actualCompleteDate = " + actualCompleteDate + ", executor = " + executor + + ", result = " + result + ", remark = " + remark + + ", reason = " + reason + ", createUser = " + createUser + ", createdDateTime = " + createdDateTime + ", modifyUser = " + modifyUser + diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectTaskParam.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectTaskParam.java index 50445978..afb363fd 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectTaskParam.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectTaskParam.java @@ -4,6 +4,7 @@ import java.io.Serializable; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; @@ -15,7 +16,7 @@ import com.baomidou.mybatisplus.annotation.IdType; *

* * @author pavel.Liu - * @since 2021-06-10 + * @since 2021-07-01 */ @TableName("Z_RESOURCE_INSPECT_TASK_PARAM") @@ -27,76 +28,71 @@ public class ResourceInspectTaskParam extends Model { /** * 主键 */ - @TableField("HANDLE") + @TableId(value = "HANDLE", type = IdType.INPUT) private String handle; - /** - * 设备编号HANDLE - */ - @TableField("RESOURCE_INSPECT_TASK_BO") - private String resourceInspectTaskBo; /** * 检验项目编号 */ - @TableField("RESOURCE_BO") - private String resourceBo; - /** - * 检验项目描述 - */ @TableField("INSPECT_NO") private String inspectNo; /** - * 检验方法 + * 任务HANDLE + */ + @TableField("RESOURCE_INSPECT_TASK_BO") + private String resourceInspectTaskBo; + /** + * 检验项目描述 */ @TableField("DESCRIPTION") private String description; /** - * 检验数据类型（文本T、数字N、布尔值B） + * 检验方式/方法 */ @TableField("INSPECT_METHOD") private String inspectMethod; /** - * 是否必填 + * 检验数据类型（文本T、数字N、布尔值B） */ @TableField("INSPECT_DATA_TYPE") private String inspectDataType; /** - * 最小值 + * 参数单位 + */ + @TableField("PARAM_UNIT") + private String paramUnit; + /** + * 是否必填【Y必填，N非必填】 */ @TableField("REQUIRED") private String required; /** - * 最大值 + * 最小值 */ @TableField("MIN_VALUE") private Double minValue; /** - * 标准值 + * 最大值 */ @TableField("MAX_VALUE") private Double maxValue; /** - * 检验值 + * 标准值 */ @TableField("STANDARD_VALUE") private String standardValue; /** - * 参数单位 + * 结果值 */ - @TableField("RESRCE_VALUE") - private String resrceValue; + @TableField("RESULT_VALUE") + private String resultValue; /** - * 检验结果【Y/N】 + * 结果【Y/N】 */ - @TableField("PARAM_UNIT") - private String paramUnit; + @TableField("RESULT") + private String result; /** * 备注 */ - @TableField("RESRCE") - private String resrce; - /** - * 执行人 - */ @TableField("REMARK") private String remark; /** @@ -120,29 +116,26 @@ public class ResourceInspectTaskParam extends Model { @TableField("MODIFIED_DATE_TIME") private LocalDateTime modifiedDateTime; + /** + * 序号 + * **/ + @TableField(exist = false) + private Integer seq; - public String getHandle() { - return handle; + public Integer getSeq() { + return seq; } - public void setHandle(String handle) { - this.handle = handle; - } - - public String getResourceInspectTaskBo() { - return resourceInspectTaskBo; - } - - public void setResourceInspectTaskBo(String resourceInspectTaskBo) { - this.resourceInspectTaskBo = resourceInspectTaskBo; + public void setSeq(Integer seq) { + this.seq = seq; } - public String getResourceBo() { - return resourceBo; + public String getHandle() { + return handle; } - public void setResourceBo(String resourceBo) { - this.resourceBo = resourceBo; + public void setHandle(String handle) { + this.handle = handle; } public String getInspectNo() { @@ -153,6 +146,14 @@ public class ResourceInspectTaskParam extends Model { this.inspectNo = inspectNo; } + public String getResourceInspectTaskBo() { + return resourceInspectTaskBo; + } + + public void setResourceInspectTaskBo(String resourceInspectTaskBo) { + this.resourceInspectTaskBo = resourceInspectTaskBo; + } + public String getDescription() { return description; } @@ -177,6 +178,14 @@ public class ResourceInspectTaskParam extends Model { this.inspectDataType = inspectDataType; } + public String getParamUnit() { + return paramUnit; + } + + public void setParamUnit(String paramUnit) { + this.paramUnit = paramUnit; + } + public String getRequired() { return required; } @@ -209,28 +218,20 @@ public class ResourceInspectTaskParam extends Model { this.standardValue = standardValue; } - public String getResrceValue() { - return resrceValue; + public String getResultValue() { + return resultValue; } - public void setResrceValue(String resrceValue) { - this.resrceValue = resrceValue; + public void setResultValue(String resultValue) { + this.resultValue = resultValue; } - public String getParamUnit() { - return paramUnit; - } - - public void setParamUnit(String paramUnit) { - this.paramUnit = paramUnit; + public String getResult() { + return result; } - public String getResrce() { - return resrce; - } - - public void setResrce(String resrce) { - this.resrce = resrce; + public void setResult(String result) { + this.result = result; } public String getRemark() { @@ -275,18 +276,18 @@ public class ResourceInspectTaskParam extends Model { public static final String HANDLE = "HANDLE"; -public static final String RESOURCE_INSPECT_TASK_BO = "RESOURCE_INSPECT_TASK_BO"; - -public static final String RESOURCE_BO = "RESOURCE_BO"; - public static final String INSPECT_NO = "INSPECT_NO"; +public static final String RESOURCE_INSPECT_TASK_BO = "RESOURCE_INSPECT_TASK_BO"; + public static final String DESCRIPTION = "DESCRIPTION"; public static final String INSPECT_METHOD = "INSPECT_METHOD"; public static final String INSPECT_DATA_TYPE = "INSPECT_DATA_TYPE"; +public static final String PARAM_UNIT = "PARAM_UNIT"; + public static final String REQUIRED = "REQUIRED"; public static final String MIN_VALUE = "MIN_VALUE"; @@ -295,11 +296,9 @@ public static final String MAX_VALUE = "MAX_VALUE"; public static final String STANDARD_VALUE = "STANDARD_VALUE"; -public static final String RESRCE_VALUE = "RESRCE_VALUE"; - -public static final String PARAM_UNIT = "PARAM_UNIT"; +public static final String RESULT_VALUE = "RESULT_VALUE"; -public static final String RESRCE = "RESRCE"; +public static final String RESULT = "RESULT"; public static final String REMARK = "REMARK"; @@ -321,19 +320,18 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; public String toString() { return "ResourceInspectTaskParam{" + "handle = " + handle + - ", resourceInspectTaskBo = " + resourceInspectTaskBo + - ", resourceBo = " + resourceBo + ", inspectNo = " + inspectNo + + ", resourceInspectTaskBo = " + resourceInspectTaskBo + ", description = " + description + ", inspectMethod = " + inspectMethod + ", inspectDataType = " + inspectDataType + + ", paramUnit = " + paramUnit + ", required = " + required + ", minValue = " + minValue + ", maxValue = " + maxValue + ", standardValue = " + standardValue + - ", resrceValue = " + resrceValue + - ", paramUnit = " + paramUnit + - ", resrce = " + resrce + + ", resultValue = " + resultValue + + ", result = " + result + ", remark = " + remark + ", createUser = " + createUser + ", createdDateTime = " + createdDateTime + diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectTaskSpare.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectTaskSpare.java new file mode 100644 index 00000000..ad7bc754 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectTaskSpare.java @@ -0,0 +1,246 @@ +package com.foreverwin.mesnac.equip.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; + +/** + *

+ * 设备检验任务-备品表 + *

+ * + * @author pavel.Liu + * @since 2021-07-01 + */ + +@TableName("Z_RESOURCE_INSPECT_TASK_SPARE") + +public class ResourceInspectTaskSpare extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "HANDLE", type = IdType.INPUT) + private String handle; + /** + * 备品编号 + */ + @TableField("SPARE_NO") + private String spareNo; + /** + * 任务HANDLE + */ + @TableField("RESOURCE_INSPECT_TASK_BO") + private String resourceInspectTaskBo; + /** + * 备品HANDLE + */ + @TableField("ITEM_BO") + private String itemBo; + /** + * 备品描述 + */ + @TableField("DESCRIPTION") + private String description; + /** + * 数量 + */ + @TableField("QTY") + private Double qty; + /** + * 单位 + */ + @TableField("UNIT") + private String unit; + /** + * 备注 + */ + @TableField("REMARK") + private String remark; + /** + * 创建人 + */ + @TableField("CREATE_USER") + private String createUser; + /** + * 创建时间 + */ + @TableField("CREATED_DATE_TIME") + private LocalDateTime createdDateTime; + /** + * 修改人 + */ + @TableField("MODIFY_USER") + private String modifyUser; + /** + * 修改时间 + */ + @TableField("MODIFIED_DATE_TIME") + private LocalDateTime modifiedDateTime; + + /** + * 序号 + * **/ + @TableField(exist = false) + private Integer seq; + + public Integer getSeq() { + return seq; + } + + public void setSeq(Integer seq) { + this.seq = seq; + } + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getSpareNo() { + return spareNo; + } + + public void setSpareNo(String spareNo) { + this.spareNo = spareNo; + } + + public String getResourceInspectTaskBo() { + return resourceInspectTaskBo; + } + + public void setResourceInspectTaskBo(String resourceInspectTaskBo) { + this.resourceInspectTaskBo = resourceInspectTaskBo; + } + + public String getItemBo() { + return itemBo; + } + + public void setItemBo(String itemBo) { + this.itemBo = itemBo; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Double getQty() { + return qty; + } + + public void setQty(Double qty) { + this.qty = qty; + } + + public String getUnit() { + return unit; + } + + public void setUnit(String unit) { + this.unit = unit; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public LocalDateTime getCreatedDateTime() { + return createdDateTime; + } + + public void setCreatedDateTime(LocalDateTime createdDateTime) { + this.createdDateTime = createdDateTime; + } + + public String getModifyUser() { + return modifyUser; + } + + public void setModifyUser(String modifyUser) { + this.modifyUser = modifyUser; + } + + public LocalDateTime getModifiedDateTime() { + return modifiedDateTime; + } + + public void setModifiedDateTime(LocalDateTime modifiedDateTime) { + this.modifiedDateTime = modifiedDateTime; + } + +public static final String HANDLE = "HANDLE"; + +public static final String SPARE_NO = "SPARE_NO"; + +public static final String RESOURCE_INSPECT_TASK_BO = "RESOURCE_INSPECT_TASK_BO"; + +public static final String ITEM_BO = "ITEM_BO"; + +public static final String DESCRIPTION = "DESCRIPTION"; + +public static final String QTY = "QTY"; + +public static final String UNIT = "UNIT"; + +public static final String REMARK = "REMARK"; + +public static final String CREATE_USER = "CREATE_USER"; + +public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; + +public static final String MODIFY_USER = "MODIFY_USER"; + +public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "ResourceInspectTaskSpare{" + + "handle = " + handle + + ", spareNo = " + spareNo + + ", resourceInspectTaskBo = " + resourceInspectTaskBo + + ", itemBo = " + itemBo + + ", description = " + description + + ", qty = " + qty + + ", unit = " + unit + + ", remark = " + remark + + ", createUser = " + createUser + + ", createdDateTime = " + createdDateTime + + ", modifyUser = " + modifyUser + + ", modifiedDateTime = " + modifiedDateTime + + "}"; + } +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectTaskParamService.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectTaskParamService.java index 1eec60f6..b5d28e1f 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectTaskParamService.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectTaskParamService.java @@ -13,7 +13,7 @@ import java.util.List; *

* * @author pavel.Liu - * @since 2021-06-10 + * @since 2021-06-29 */ public interface ResourceInspectTaskParamService extends IService { @@ -25,4 +25,7 @@ public interface ResourceInspectTaskParamService extends IService selectPage(FrontPage frontPage, ResourceInspectTaskParam resourceInspectTaskParam); List selectList(ResourceInspectTaskParam resourceInspectTaskParam); + + void removeAll(ResourceInspectTaskParam resourceInspectTaskParam); + } \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectTaskService.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectTaskService.java index c7891d18..c35f8847 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectTaskService.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectTaskService.java @@ -1,8 +1,10 @@ package com.foreverwin.mesnac.equip.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.equip.dto.ResourceInspectTaskDto; import com.foreverwin.mesnac.equip.model.ResourceInspectTask; import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.mesnac.equip.model.ResourceInspectTaskParam; import com.foreverwin.modular.core.util.FrontPage; import java.util.List; @@ -25,4 +27,24 @@ public interface ResourceInspectTaskService extends IService selectPage(FrontPage frontPage, ResourceInspectTask resourceInspectTask); List selectList(ResourceInspectTask resourceInspectTask); + + /** + * 任务总览 + * @param resourceInspectTaskDto + * @return + */ + List findResourceInspectTaskList(ResourceInspectTaskDto resourceInspectTaskDto); + + /**获取检验任务明细 + * 判断状态； + * 1、检验明细是否创建 + * 2、检验清单是否更新 + * **/ + ResourceInspectTask getResourceInspectTaskAll(ResourceInspectTask resourceInspectTask); + + /** + * 点击保存：保存任务主表，检验项从表、备品从表 + */ + void saveOrUpdateTaskInfo(ResourceInspectTaskDto resourceInspectTaskDto); + } \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectTaskSpareService.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectTaskSpareService.java new file mode 100644 index 00000000..9be8a433 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectTaskSpareService.java @@ -0,0 +1,31 @@ +package com.foreverwin.mesnac.equip.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.equip.model.ResourceInspectTaskSpare; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 设备检验任务-备品表 服务类 + *

+ * + * @author pavel.Liu + * @since 2021-06-30 + */ +public interface ResourceInspectTaskSpareService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, ResourceInspectTaskSpare resourceInspectTaskSpare); + + List selectList(ResourceInspectTaskSpare resourceInspectTaskSpare); + + void removeAll(ResourceInspectTaskSpare resourceInspectTaskSpare); + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskParamServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskParamServiceImpl.java index 378ee074..786c41bb 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskParamServiceImpl.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskParamServiceImpl.java @@ -18,7 +18,7 @@ import java.util.List; *

* * @author pavel.Liu - * @since 2021-06-10 + * @since 2021-06-29 */ @Service @Transactional(rollbackFor = Exception.class) @@ -42,5 +42,12 @@ public class ResourceInspectTaskParamServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectTaskParam); + super.remove(queryWrapper); + } + } \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java index 1f268d47..bb9aefb2 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java @@ -1,5 +1,17 @@ package com.foreverwin.mesnac.equip.service.impl; +import com.foreverwin.mesnac.common.enums.HandleEnum; +import com.foreverwin.mesnac.common.model.InspectionItemDetail; +import com.foreverwin.mesnac.common.service.InspectionItemDetailService; +import com.foreverwin.mesnac.equip.dto.ResourceInspectTaskDto; +import com.foreverwin.mesnac.equip.model.ResourceInspectPlan; +import com.foreverwin.mesnac.equip.model.ResourceInspectTaskParam; +import com.foreverwin.mesnac.equip.model.ResourceInspectTaskSpare; +import com.foreverwin.mesnac.equip.service.ResourceInspectPlanService; +import com.foreverwin.mesnac.equip.service.ResourceInspectTaskParamService; +import com.foreverwin.mesnac.equip.service.ResourceInspectTaskSpareService; +import com.foreverwin.modular.core.exception.BusinessException; +import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.FrontPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -11,7 +23,12 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Collection; import java.util.List; +import java.util.UUID; + /** *

* 设备检验任务表 服务实现类 @@ -27,6 +44,16 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, ResourceInspectTask resourceInspectTask) { @@ -42,5 +69,165 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl findResourceInspectTaskList(ResourceInspectTaskDto resourceInspectTaskDto) { + String currentUser = CommonMethods.getUser(); + String site = CommonMethods.getSite(); + String userBo = HandleEnum.USR.getHandle(site, currentUser); + resourceInspectTaskDto.setCurrentUser(userBo); + resourceInspectTaskDto.setSite(site); + List list = resourceInspectTaskMapper.findResourceInspectTaskList(resourceInspectTaskDto); + for (ResourceInspectTaskDto task:list) { + task.setResourceTypeNo(task.getResourceTypeBo().split(",")[1]); + task.setCycle(getCycle(task)); + task.setCurrentUser(currentUser); + } + return list; + } + + @Override + public ResourceInspectTask getResourceInspectTaskAll(ResourceInspectTask resourceInspectTask) { + List taskList = resourceInspectTaskService.selectList(resourceInspectTask); + if (taskList.size()==1){ + resourceInspectTask = taskList.get(0); + }else { + throw BusinessException.build("无法获取任务详情！！！"); + } + String taskHandle = resourceInspectTask.getHandle(); + String taskStatus = resourceInspectTask.getStatus(); + ResourceInspectTaskParam resourceInspectTaskParam = new ResourceInspectTaskParam(); + resourceInspectTaskParam.setResourceInspectTaskBo(taskHandle); + if (taskStatus.equals("401")){ + // 判断数据是否已创建 + List taskParams = resourceInspectTaskParamService.selectList(resourceInspectTaskParam); + // 任务状态为新建时，判断检验项是否更新 + String inspectionItemBo = resourceInspectTask.getInspectionItemBo(); + String resourceInspectPlanBo = resourceInspectTask.getResourceInspectPlanBo(); + ResourceInspectPlan resourceInspectPlan = resourceInspectPlanService.getById(resourceInspectPlanBo); + String planInspectionItemBo = resourceInspectPlan.getInspectionItemBo(); + // 检验项目清单修改：更新明细表 + if (inspectionItemBo.equals(planInspectionItemBo)){ + // 数据未创建——>全增 + if (taskParams.size() == 0){ + createAndSaveItemParams(taskHandle,inspectionItemBo); + } + }else{ + // 判断数据是否已存在：1、存在，则全删全增；2、不存在，全增 + if ( taskParams.size() > 0 ){ + resourceInspectTaskParamService.removeAll(resourceInspectTaskParam); + } + createAndSaveItemParams(taskHandle,planInspectionItemBo); + } + } + // 新建且检验项清单未变更/非新建状态，直接返回明细清单数据 + List itemParamList = resourceInspectTaskParamService.selectList(resourceInspectTaskParam); + ResourceInspectTaskSpare resourceInspectTaskSpare = new ResourceInspectTaskSpare(); + resourceInspectTaskSpare.setResourceInspectTaskBo(taskHandle); + List taskSpareList = resourceInspectTaskSpareService.selectList(resourceInspectTaskSpare); + resourceInspectTask.setTaskItemDetailList(itemParamList); + resourceInspectTask.setTaskSpareList(taskSpareList); + return resourceInspectTask; + } + + @Override + public void saveOrUpdateTaskInfo(ResourceInspectTaskDto resourceInspectTaskDto) { + // 站点、任务编号——任务handle + String site = CommonMethods.getSite(); + String taskNo = resourceInspectTaskDto.getTaskNo(); + String taskHandle = HandleEnum.RESOURCE_INSPECT_TASK.getHandle(site, taskNo); + String executor = resourceInspectTaskDto.getExecutor(); + // 检验项、备品清单 + List taskItemDetailList = resourceInspectTaskDto.getTaskItemDetailList(); + List taskSpareList = resourceInspectTaskDto.getTaskSpareList(); + // 任务主表字段：任务状态、修改人员、修改时间 + ResourceInspectTask task = resourceInspectTaskService.getById(taskHandle); + task.setStatus(resourceInspectTaskDto.getStatus()); + task.setModifyUser(executor); + task.setModifiedDateTime(LocalDateTime.now()); + resourceInspectTaskService.saveOrUpdate(task); + // 检验项全删、全增 + ResourceInspectTaskParam resourceInspectTaskParam = new ResourceInspectTaskParam(); + resourceInspectTaskParam.setResourceInspectTaskBo(taskHandle); + /*List taskParams = resourceInspectTaskParamService.selectList(resourceInspectTaskParam); + if ( taskParams.size() > 0 ){ + + }*/ + resourceInspectTaskParamService.removeAll(resourceInspectTaskParam); + for (ResourceInspectTaskParam taskParam:taskItemDetailList) { + taskParam.setCreatedDateTime(LocalDateTime.now()); + taskParam.setCreateUser(executor); + } + resourceInspectTaskParamService.saveBatch(taskItemDetailList); + // 备品全删、全增 + ResourceInspectTaskSpare resourceInspectTaskSpare = new ResourceInspectTaskSpare(); + resourceInspectTaskSpare.setResourceInspectTaskBo(taskHandle); + resourceInspectTaskSpareService.removeAll(resourceInspectTaskSpare); + for (ResourceInspectTaskSpare taskSpare:taskSpareList) { + if (taskSpare.getDescription()==null){ + continue; + } + taskSpare.setResourceInspectTaskBo(taskHandle); + taskSpare.setHandle(HandleEnum.RESOURCE_INSPECT_TASK_SPARE.getHandle(site,UUID.randomUUID().toString())); + taskSpare.setCreatedDateTime(LocalDateTime.now()); + taskSpare.setCreateUser(executor); + } + resourceInspectTaskSpareService.saveBatch(taskSpareList); + } + + /*** + * 任务创建周期 + */ + private String getCycle(ResourceInspectTaskDto task){ + String frequencyUnit = task.getFrequencyUnit(); + String frequency = task.getFrequency(); + StringBuffer cycle = new StringBuffer("每"); + switch (frequencyUnit){ + case "D": + cycle = cycle.append(frequency).append("天"); + break; + case "H": + cycle = cycle.append(frequency).append("时"); + break; + case "W": + cycle = cycle.append(frequency).append("周"); + break; + case "M": + cycle = cycle.append(frequency).append("月"); + break; + } + return cycle.toString(); + } + + /*** + * 创建检验明细表 + */ + private void createAndSaveItemParams(String taskHandel,String inspectionItemBo){ + InspectionItemDetail inspectionItemDetail = new InspectionItemDetail(); + inspectionItemDetail.setInspectionItemBo(inspectionItemBo); + List itemDetails = inspectionItemDetailService.selectList(inspectionItemDetail); + List paramList = new ArrayList<>(); + for (InspectionItemDetail detail:itemDetails) { + ResourceInspectTaskParam resourceInspectTaskParam = new ResourceInspectTaskParam(); + // 检验项编号、描述；外键：任务handle、设备handle + resourceInspectTaskParam.setHandle(taskHandel+";"+detail.getHandle()); + resourceInspectTaskParam.setInspectNo(detail.getParamNo()); + resourceInspectTaskParam.setDescription(detail.getDescription()); + resourceInspectTaskParam.setResourceInspectTaskBo(taskHandel); + // 检验方法、数据类型、单位、 + resourceInspectTaskParam.setInspectMethod(detail.getInspectionMethod()); + resourceInspectTaskParam.setInspectDataType(detail.getParamType()); + resourceInspectTaskParam.setParamUnit(detail.getParamUnit()); + // 是否必填、最大最、最小值、标准值 + resourceInspectTaskParam.setRequired(detail.getIsRequired()); + resourceInspectTaskParam.setMaxValue(detail.getMaxValue()); + resourceInspectTaskParam.setMinValue(detail.getMinValue()); + resourceInspectTaskParam.setStandardValue(detail.getStandardValue()); + resourceInspectTaskParam.setCreateUser("测试数据DEL"); + resourceInspectTaskParam.setCreatedDateTime(LocalDateTime.now()); + paramList.add(resourceInspectTaskParam); + } + resourceInspectTaskParamService.saveBatch(paramList); + } + } \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskSpareServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskSpareServiceImpl.java new file mode 100644 index 00000000..44e6962a --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskSpareServiceImpl.java @@ -0,0 +1,53 @@ +package com.foreverwin.mesnac.equip.service.impl; + +import com.foreverwin.modular.core.util.FrontPage; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.equip.model.ResourceInspectTaskSpare; +import com.foreverwin.mesnac.equip.mapper.ResourceInspectTaskSpareMapper; +import com.foreverwin.mesnac.equip.service.ResourceInspectTaskSpareService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +/** + *

+ * 设备检验任务-备品表 服务实现类 + *

+ * + * @author pavel.Liu + * @since 2021-06-30 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class ResourceInspectTaskSpareServiceImpl extends ServiceImpl implements ResourceInspectTaskSpareService { + + + @Autowired + private ResourceInspectTaskSpareMapper resourceInspectTaskSpareMapper; + + @Override + public IPage selectPage(FrontPage frontPage, ResourceInspectTaskSpare resourceInspectTaskSpare) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectTaskSpare); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(ResourceInspectTaskSpare resourceInspectTaskSpare) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectTaskSpare); + return super.list(queryWrapper); + } + + @Override + public void removeAll(ResourceInspectTaskSpare resourceInspectTaskSpare) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectTaskSpare); + super.remove(queryWrapper); + } + + +} \ No newline at end of file diff --git a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml index 96036da9..f777da27 100644 --- a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml +++ b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml @@ -13,14 +13,15 @@ - + + @@ -29,7 +30,7 @@ - HANDLE, SITE, TASK_NO, CATEGORY, DESCRIPTION, STATUS, RESOURCE_INSPECT_PLAN_BO, INSPECTION_ITEM_BO, RESOURCE_BO, RESULT, TASK_CREATE_DATE, PLAN_START_DATE, PLAN_COMPLETE_DATE, ACTUAL_START_DATE, ACTUAL_COMPLETE_DATE, EXECUTOR, REMARK, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME + HANDLE, SITE, TASK_NO, CATEGORY, DESCRIPTION, STATUS, RESOURCE_INSPECT_PLAN_BO, INSPECTION_ITEM_BO, RESOURCE_BO, TASK_CREATE_DATE, PLAN_START_DATE, PLAN_COMPLETE_DATE, ACTUAL_START_DATE, ACTUAL_COMPLETE_DATE, EXECUTOR, RESULT, REMARK, REASON, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME @@ -72,14 +73,15 @@ AND RESOURCE_INSPECT_PLAN_BO=#{ew.entity.resourceInspectPlanBo} AND INSPECTION_ITEM_BO=#{ew.entity.inspectionItemBo} AND RESOURCE_BO=#{ew.entity.resourceBo} - AND RESULT=#{ew.entity.result} AND TASK_CREATE_DATE=#{ew.entity.taskCreateDate} AND PLAN_START_DATE=#{ew.entity.planStartDate} AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} AND EXECUTOR=#{ew.entity.executor} + AND RESULT=#{ew.entity.result} AND REMARK=#{ew.entity.remark} + AND REASON=#{ew.entity.reason} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFY_USER=#{ew.entity.modifyUser} @@ -103,14 +105,15 @@ AND RESOURCE_INSPECT_PLAN_BO=#{ew.entity.resourceInspectPlanBo} AND INSPECTION_ITEM_BO=#{ew.entity.inspectionItemBo} AND RESOURCE_BO=#{ew.entity.resourceBo} - AND RESULT=#{ew.entity.result} AND TASK_CREATE_DATE=#{ew.entity.taskCreateDate} AND PLAN_START_DATE=#{ew.entity.planStartDate} AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} AND EXECUTOR=#{ew.entity.executor} + AND RESULT=#{ew.entity.result} AND REMARK=#{ew.entity.remark} + AND REASON=#{ew.entity.reason} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFY_USER=#{ew.entity.modifyUser} @@ -142,14 +145,15 @@ AND RESOURCE_INSPECT_PLAN_BO=#{ew.entity.resourceInspectPlanBo} AND INSPECTION_ITEM_BO=#{ew.entity.inspectionItemBo} AND RESOURCE_BO=#{ew.entity.resourceBo} - AND RESULT=#{ew.entity.result} AND TASK_CREATE_DATE=#{ew.entity.taskCreateDate} AND PLAN_START_DATE=#{ew.entity.planStartDate} AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} AND EXECUTOR=#{ew.entity.executor} + AND RESULT=#{ew.entity.result} AND REMARK=#{ew.entity.remark} + AND REASON=#{ew.entity.reason} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFY_USER=#{ew.entity.modifyUser} @@ -181,14 +185,15 @@ AND RESOURCE_INSPECT_PLAN_BO=#{ew.entity.resourceInspectPlanBo} AND INSPECTION_ITEM_BO=#{ew.entity.inspectionItemBo} AND RESOURCE_BO=#{ew.entity.resourceBo} - AND RESULT=#{ew.entity.result} AND TASK_CREATE_DATE=#{ew.entity.taskCreateDate} AND PLAN_START_DATE=#{ew.entity.planStartDate} AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} AND EXECUTOR=#{ew.entity.executor} + AND RESULT=#{ew.entity.result} AND REMARK=#{ew.entity.remark} + AND REASON=#{ew.entity.reason} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFY_USER=#{ew.entity.modifyUser} @@ -220,14 +225,15 @@ AND RESOURCE_INSPECT_PLAN_BO=#{ew.entity.resourceInspectPlanBo} AND INSPECTION_ITEM_BO=#{ew.entity.inspectionItemBo} AND RESOURCE_BO=#{ew.entity.resourceBo} - AND RESULT=#{ew.entity.result} AND TASK_CREATE_DATE=#{ew.entity.taskCreateDate} AND PLAN_START_DATE=#{ew.entity.planStartDate} AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} AND EXECUTOR=#{ew.entity.executor} + AND RESULT=#{ew.entity.result} AND REMARK=#{ew.entity.remark} + AND REASON=#{ew.entity.reason} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFY_USER=#{ew.entity.modifyUser} @@ -259,14 +265,15 @@ AND RESOURCE_INSPECT_PLAN_BO=#{ew.entity.resourceInspectPlanBo} AND INSPECTION_ITEM_BO=#{ew.entity.inspectionItemBo} AND RESOURCE_BO=#{ew.entity.resourceBo} - AND RESULT=#{ew.entity.result} AND TASK_CREATE_DATE=#{ew.entity.taskCreateDate} AND PLAN_START_DATE=#{ew.entity.planStartDate} AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} AND EXECUTOR=#{ew.entity.executor} + AND RESULT=#{ew.entity.result} AND REMARK=#{ew.entity.remark} + AND REASON=#{ew.entity.reason} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFY_USER=#{ew.entity.modifyUser} @@ -298,14 +305,15 @@ AND RESOURCE_INSPECT_PLAN_BO=#{ew.entity.resourceInspectPlanBo} AND INSPECTION_ITEM_BO=#{ew.entity.inspectionItemBo} AND RESOURCE_BO=#{ew.entity.resourceBo} - AND RESULT=#{ew.entity.result} AND TASK_CREATE_DATE=#{ew.entity.taskCreateDate} AND PLAN_START_DATE=#{ew.entity.planStartDate} AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} AND EXECUTOR=#{ew.entity.executor} + AND RESULT=#{ew.entity.result} AND REMARK=#{ew.entity.remark} + AND REASON=#{ew.entity.reason} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFY_USER=#{ew.entity.modifyUser} @@ -333,14 +341,15 @@ RESOURCE_INSPECT_PLAN_BO, INSPECTION_ITEM_BO, RESOURCE_BO, - RESULT, TASK_CREATE_DATE, PLAN_START_DATE, PLAN_COMPLETE_DATE, ACTUAL_START_DATE, ACTUAL_COMPLETE_DATE, EXECUTOR, + RESULT, REMARK, + REASON, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, @@ -356,14 +365,15 @@ #{resourceInspectPlanBo}, #{inspectionItemBo}, #{resourceBo}, - #{result}, #{taskCreateDate}, #{planStartDate}, #{planCompleteDate}, #{actualStartDate}, #{actualCompleteDate}, #{executor}, + #{result}, #{remark}, + #{reason}, #{createUser}, #{createdDateTime}, #{modifyUser}, @@ -386,14 +396,15 @@ #{resourceInspectPlanBo}, #{inspectionItemBo}, #{resourceBo}, - #{result}, #{taskCreateDate}, #{planStartDate}, #{planCompleteDate}, #{actualStartDate}, #{actualCompleteDate}, #{executor}, + #{result}, #{remark}, + #{reason}, #{createUser}, #{createdDateTime}, #{modifyUser}, @@ -412,14 +423,15 @@ RESOURCE_INSPECT_PLAN_BO=#{et.resourceInspectPlanBo}, INSPECTION_ITEM_BO=#{et.inspectionItemBo}, RESOURCE_BO=#{et.resourceBo}, - RESULT=#{et.result}, TASK_CREATE_DATE=#{et.taskCreateDate}, PLAN_START_DATE=#{et.planStartDate}, PLAN_COMPLETE_DATE=#{et.planCompleteDate}, ACTUAL_START_DATE=#{et.actualStartDate}, ACTUAL_COMPLETE_DATE=#{et.actualCompleteDate}, EXECUTOR=#{et.executor}, + RESULT=#{et.result}, REMARK=#{et.remark}, + REASON=#{et.reason}, CREATE_USER=#{et.createUser}, CREATED_DATE_TIME=#{et.createdDateTime}, MODIFY_USER=#{et.modifyUser}, @@ -438,14 +450,15 @@ RESOURCE_INSPECT_PLAN_BO=#{et.resourceInspectPlanBo}, INSPECTION_ITEM_BO=#{et.inspectionItemBo}, RESOURCE_BO=#{et.resourceBo}, - RESULT=#{et.result}, TASK_CREATE_DATE=#{et.taskCreateDate}, PLAN_START_DATE=#{et.planStartDate}, PLAN_COMPLETE_DATE=#{et.planCompleteDate}, ACTUAL_START_DATE=#{et.actualStartDate}, ACTUAL_COMPLETE_DATE=#{et.actualCompleteDate}, EXECUTOR=#{et.executor}, + RESULT=#{et.result}, REMARK=#{et.remark}, + REASON=#{et.reason}, CREATE_USER=#{et.createUser}, CREATED_DATE_TIME=#{et.createdDateTime}, MODIFY_USER=#{et.modifyUser}, @@ -464,14 +477,15 @@ RESOURCE_INSPECT_PLAN_BO=#{et.resourceInspectPlanBo}, INSPECTION_ITEM_BO=#{et.inspectionItemBo}, RESOURCE_BO=#{et.resourceBo}, - RESULT=#{et.result}, TASK_CREATE_DATE=#{et.taskCreateDate}, PLAN_START_DATE=#{et.planStartDate}, PLAN_COMPLETE_DATE=#{et.planCompleteDate}, ACTUAL_START_DATE=#{et.actualStartDate}, ACTUAL_COMPLETE_DATE=#{et.actualCompleteDate}, EXECUTOR=#{et.executor}, + RESULT=#{et.result}, REMARK=#{et.remark}, + REASON=#{et.reason}, CREATE_USER=#{et.createUser}, CREATED_DATE_TIME=#{et.createdDateTime}, MODIFY_USER=#{et.modifyUser}, @@ -489,14 +503,15 @@ AND RESOURCE_INSPECT_PLAN_BO=#{ew.entity.resourceInspectPlanBo} AND INSPECTION_ITEM_BO=#{ew.entity.inspectionItemBo} AND RESOURCE_BO=#{ew.entity.resourceBo} - AND RESULT=#{ew.entity.result} AND TASK_CREATE_DATE=#{ew.entity.taskCreateDate} AND PLAN_START_DATE=#{ew.entity.planStartDate} AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} AND EXECUTOR=#{ew.entity.executor} + AND RESULT=#{ew.entity.result} AND REMARK=#{ew.entity.remark} + AND REASON=#{ew.entity.reason} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFY_USER=#{ew.entity.modifyUser} @@ -545,14 +560,15 @@ AND RESOURCE_INSPECT_PLAN_BO=#{ew.entity.resourceInspectPlanBo} AND INSPECTION_ITEM_BO=#{ew.entity.inspectionItemBo} AND RESOURCE_BO=#{ew.entity.resourceBo} - AND RESULT=#{ew.entity.result} AND TASK_CREATE_DATE=#{ew.entity.taskCreateDate} AND PLAN_START_DATE=#{ew.entity.planStartDate} AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} AND EXECUTOR=#{ew.entity.executor} + AND RESULT=#{ew.entity.result} AND REMARK=#{ew.entity.remark} + AND REASON=#{ew.entity.reason} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFY_USER=#{ew.entity.modifyUser} @@ -575,4 +591,50 @@ + + + diff --git a/equip/src/main/resources/mapper/ResourceInspectTaskParamMapper.xml b/equip/src/main/resources/mapper/ResourceInspectTaskParamMapper.xml index 2d68640b..d932e90e 100644 --- a/equip/src/main/resources/mapper/ResourceInspectTaskParamMapper.xml +++ b/equip/src/main/resources/mapper/ResourceInspectTaskParamMapper.xml @@ -4,20 +4,19 @@ - - - + + + - - - + + @@ -27,10 +26,13 @@ - HANDLE, RESOURCE_INSPECT_TASK_BO, RESOURCE_BO, INSPECT_NO, DESCRIPTION, INSPECT_METHOD, INSPECT_DATA_TYPE, REQUIRED, MIN_VALUE, MAX_VALUE, STANDARD_VALUE, RESRCE_VALUE, PARAM_UNIT, RESRCE, REMARK, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME + HANDLE, INSPECT_NO, RESOURCE_INSPECT_TASK_BO, DESCRIPTION, INSPECT_METHOD, INSPECT_DATA_TYPE, PARAM_UNIT, REQUIRED, MIN_VALUE, MAX_VALUE, STANDARD_VALUE, RESULT_VALUE, RESULT, REMARK, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME + + + SELECT FROM Z_RESOURCE_INSPECT_TASK_SPARE WHERE HANDLE=#{handle} + + + + + + + + + + + + + + + + + + + + + + INSERT INTO Z_RESOURCE_INSPECT_TASK_SPARE + + HANDLE, + SPARE_NO, + RESOURCE_INSPECT_TASK_BO, + ITEM_BO, + DESCRIPTION, + QTY, + UNIT, + REMARK, + CREATE_USER, + CREATED_DATE_TIME, + MODIFY_USER, + MODIFIED_DATE_TIME, + VALUES + + #{handle}, + #{spareNo}, + #{resourceInspectTaskBo}, + #{itemBo}, + #{description}, + #{qty}, + #{unit}, + #{remark}, + #{createUser}, + #{createdDateTime}, + #{modifyUser}, + #{modifiedDateTime}, + + + + + INSERT INTO Z_RESOURCE_INSPECT_TASK_SPARE + + + VALUES + + #{handle}, + #{spareNo}, + #{resourceInspectTaskBo}, + #{itemBo}, + #{description}, + #{qty}, + #{unit}, + #{remark}, + #{createUser}, + #{createdDateTime}, + #{modifyUser}, + #{modifiedDateTime}, + + + + + + UPDATE Z_RESOURCE_INSPECT_TASK_SPARE + SPARE_NO=#{et.spareNo}, + RESOURCE_INSPECT_TASK_BO=#{et.resourceInspectTaskBo}, + ITEM_BO=#{et.itemBo}, + DESCRIPTION=#{et.description}, + QTY=#{et.qty}, + UNIT=#{et.unit}, + REMARK=#{et.remark}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFY_USER=#{et.modifyUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_RESOURCE_INSPECT_TASK_SPARE + SPARE_NO=#{et.spareNo}, + RESOURCE_INSPECT_TASK_BO=#{et.resourceInspectTaskBo}, + ITEM_BO=#{et.itemBo}, + DESCRIPTION=#{et.description}, + QTY=#{et.qty}, + UNIT=#{et.unit}, + REMARK=#{et.remark}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFY_USER=#{et.modifyUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_RESOURCE_INSPECT_TASK_SPARE + SPARE_NO=#{et.spareNo}, + RESOURCE_INSPECT_TASK_BO=#{et.resourceInspectTaskBo}, + ITEM_BO=#{et.itemBo}, + DESCRIPTION=#{et.description}, + QTY=#{et.qty}, + UNIT=#{et.unit}, + REMARK=#{et.remark}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFY_USER=#{et.modifyUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + + + + + HANDLE=#{ew.entity.handle} + AND SPARE_NO=#{ew.entity.spareNo} + AND RESOURCE_INSPECT_TASK_BO=#{ew.entity.resourceInspectTaskBo} + AND ITEM_BO=#{ew.entity.itemBo} + AND DESCRIPTION=#{ew.entity.description} + AND QTY=#{ew.entity.qty} + AND UNIT=#{ew.entity.unit} + AND REMARK=#{ew.entity.remark} + AND CREATE_USER=#{ew.entity.createUser} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFY_USER=#{ew.entity.modifyUser} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_RESOURCE_INSPECT_TASK_SPARE WHERE HANDLE=#{handle} + + + + DELETE FROM Z_RESOURCE_INSPECT_TASK_SPARE + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM Z_RESOURCE_INSPECT_TASK_SPARE + + + + + HANDLE=#{ew.entity.handle} + + AND SPARE_NO=#{ew.entity.spareNo} + AND RESOURCE_INSPECT_TASK_BO=#{ew.entity.resourceInspectTaskBo} + AND ITEM_BO=#{ew.entity.itemBo} + AND DESCRIPTION=#{ew.entity.description} + AND QTY=#{ew.entity.qty} + AND UNIT=#{ew.entity.unit} + AND REMARK=#{ew.entity.remark} + AND CREATE_USER=#{ew.entity.createUser} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFY_USER=#{ew.entity.modifyUser} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_RESOURCE_INSPECT_TASK_SPARE WHERE HANDLE IN ( + #{item} + ) + + + + diff --git a/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java b/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java index ccb0aadd..f359b7bf 100644 --- a/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java +++ b/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java @@ -34,7 +34,7 @@ public class GeneratorApplication { MpGenerator mpGenerator = mpGeneratorBuilder.dataSourceConfig(dataSourceConfig) .tablePrefix( "APS_", "DS_", "Z_" ) .packageName( "com.foreverwin.mesnac.equip" ) - .tables("Z_RESOURCE_INSPECT_PLAN","Z_RESOURCE_INSPECT_RESOURCE","Z_RESOURCE_INSPECT_TASK","Z_RESOURCE_INSPECT_TASK_PARAM") + .tables("Z_RESOURCE_INSPECT_TASK_SPARE") .author("pavel.Liu") .uiAppId("com.foreverwin.me") .uiPackage("com.foreverwin.me.migration") diff --git a/listener/listener.iml b/listener/listener.iml deleted file mode 100644 index 78998e74..00000000 --- a/listener/listener.iml +++ /dev/null @@ -1,218 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java index d926d80d..7d97c9cd 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java @@ -32,6 +32,7 @@ public class ItemController { @GetMapping("") public R getItemList(Item item) { List result; + item.setSite(CommonMethods.getSite()); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.setEntity(item); result = itemService.list(queryWrapper); diff --git a/meapi/src/main/resources/mapper/ItemMapper.xml b/meapi/src/main/resources/mapper/ItemMapper.xml index ca10b032..2b516e93 100644 --- a/meapi/src/main/resources/mapper/ItemMapper.xml +++ b/meapi/src/main/resources/mapper/ItemMapper.xml @@ -253,7 +253,7 @@ ${ew.sqlSelect} - + FROM ITEM I