From 23882ec58d2e8db7e36bf2be2877427a02686cd6 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Thu, 8 May 2025 16:23:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E8=BF=90=E8=A1=8C=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=8A=E5=B7=A5=E5=8D=95=E6=8E=A5=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/common/biz/domain/BmStorageLog.java | 4 +- .../biz/domain/lease/WorkApplyInfo.java | 79 ++++++++++++++++ .../biz/domain/lease/WorkPeopleInfo.java | 54 +++++++++++ .../material/lease/domain/LeaseWorkOrder.java | 58 ++++++++++++ .../lease/mapper/LeaseTaskMapper.java | 18 ++++ .../service/impl/LeaseTaskServiceImpl.java | 35 ++++++- .../ma/controller/MachineController.java | 11 +++ .../ma/controller/TypeKeeperController.java | 2 +- .../material/ma/mapper/MachineMapper.java | 8 ++ .../material/ma/service/IMachineService.java | 9 ++ .../ma/service/impl/MachineServiceImpl.java | 7 ++ .../main/controller/MainController.java | 18 ++-- .../main/service/impl/MainServiceImpl.java | 12 +-- .../impl/SysWorkflowRecordServiceImpl.java | 4 +- .../mapper/material/lease/LeaseTaskMapper.xml | 93 +++++++++++++++++++ .../mapper/material/ma/MachineMapper.xml | 10 +- 16 files changed, 401 insertions(+), 21 deletions(-) create mode 100644 bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/WorkApplyInfo.java create mode 100644 bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/WorkPeopleInfo.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseWorkOrder.java diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmStorageLog.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmStorageLog.java index f0ec283d..657ac432 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmStorageLog.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmStorageLog.java @@ -135,8 +135,8 @@ public class BmStorageLog extends BaseEntity private String jsonResult; /** 创建人 */ - @Excel(name = "创建人") - @ApiModelProperty(value = "创建人") + @Excel(name = "操作人") + @ApiModelProperty(value = "操作人") private String creator; // Getters and Setters diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/WorkApplyInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/WorkApplyInfo.java new file mode 100644 index 00000000..b450d856 --- /dev/null +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/WorkApplyInfo.java @@ -0,0 +1,79 @@ +package com.bonus.common.biz.domain.lease; + +import com.bonus.common.biz.domain.BmFileInfo; +import com.bonus.common.core.annotation.Excel; +import com.bonus.common.core.web.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; +import java.util.UUID; + +/** + * + * @author xsheng + * @date 2024-10-16 + */ + +@EqualsAndHashCode(callSuper = false) +@Data +@ToString +public class WorkApplyInfo { + + private static final long serialVersionUID = 1L; + + /** ID */ + private String id; + + @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @ApiModelProperty(value = "创建人账号") + private String createUserName; + + @ApiModelProperty(value = "消息标题") + private String title; + + @ApiModelProperty(value = "消息内容") + private String content; + + @ApiModelProperty(value = "消息类型") + private int type; + + @ApiModelProperty(value = "扩展信息") + private String extend; + + @ApiModelProperty(value = "web微应用appId") + private String webAppId; + + @ApiModelProperty(value = "消息发送人") + private String sendUserName; + + @ApiModelProperty(value = "web审核页面地址") + private String webUrl; + + @ApiModelProperty(value = "消息类型id(-1为车辆的微应用内待办)") + private int typeId; + + @ApiModelProperty(value = "业务id") + private String businessId; + + @ApiModelProperty(value = "流程状态") + private String flowState; + + @ApiModelProperty(value = "app端审核路由") + private String rout; + + @ApiModelProperty(value = "下一步状态名称") + private String nextStatus; + + @ApiModelProperty(value = "扩展名称") + private String extendName; + +} diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/WorkPeopleInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/WorkPeopleInfo.java new file mode 100644 index 00000000..8d589d89 --- /dev/null +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/WorkPeopleInfo.java @@ -0,0 +1,54 @@ +package com.bonus.common.biz.domain.lease; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.util.Date; +import java.util.UUID; + +/** + * + * @author xsheng + * @date 2024-10-16 + */ + +@EqualsAndHashCode(callSuper = false) +@Data +@ToString +public class WorkPeopleInfo { + + private static final long serialVersionUID = 1L; + + /** ID */ + private String id; + + @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + @ApiModelProperty(value = "消息主表id") + private String informationId; + + @ApiModelProperty(value = "阅读状态") + private int readState; + + @ApiModelProperty(value = "处理状态") + private int handleState; + + @ApiModelProperty(value = "接收人账号") + private String receiverUsername; + + @ApiModelProperty(value = "更新人账号") + private String updateUser; + + @ApiModelProperty(value = "是否当前人审核") + private int isExamine; + +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseWorkOrder.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseWorkOrder.java new file mode 100644 index 00000000..7e6175e6 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseWorkOrder.java @@ -0,0 +1,58 @@ +package com.bonus.material.lease.domain; + +import com.bonus.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; +import lombok.experimental.Accessors; + +import javax.validation.constraints.Size; +import java.io.Serializable; +import java.util.Date; + + +@Accessors(chain = true) +@Data +@ToString +public class LeaseWorkOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + + /** ID */ + private Long id; + + private String create_time; + + private String createUserName; + + private String title; + + private String content; + + private int type; + + private String extend; + + private String webAppId; + + private String sendUserName; + + private String webUrl; + + private String typeName; + + private Long typeId; + + private String businessId; + + private int flow_state; + + private String rout; + + private String nextStatus; + + private String extendName; + +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseTaskMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseTaskMapper.java index ee272373..b6bb19a7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseTaskMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseTaskMapper.java @@ -3,6 +3,8 @@ package com.bonus.material.lease.mapper; import com.bonus.common.biz.domain.lease.LeaseApplyInfo; import com.bonus.common.biz.domain.lease.LeasePublishInfo; +import com.bonus.common.biz.domain.lease.WorkApplyInfo; +import com.bonus.common.biz.domain.lease.WorkPeopleInfo; import com.bonus.material.lease.domain.LeaseApplyDetails; import com.bonus.material.lease.domain.vo.LeaseDeptInfo; import com.bonus.material.ma.domain.Type; @@ -148,4 +150,20 @@ public interface LeaseTaskMapper { * @return */ Integer selectStatusByTaskId(Long taskId); + + /** + * 工单接入 + * + * @param + * @return 结果 + */ + int insertWorkOrder(WorkApplyInfo workApplyInfo); + + /** + * 工单接入information_people表 + * + * @param + * @return 结果 + */ + int insertWorkPeople(WorkPeopleInfo workPeopleInfo); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java index fb5fbddc..f132564c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java @@ -6,6 +6,8 @@ import com.bonus.common.biz.domain.BmFileInfo; import com.bonus.common.biz.domain.LeaseRecordInfo; import com.bonus.common.biz.domain.lease.LeaseApplyInfo; import com.bonus.common.biz.domain.lease.LeasePublishInfo; +import com.bonus.common.biz.domain.lease.WorkApplyInfo; +import com.bonus.common.biz.domain.lease.WorkPeopleInfo; import com.bonus.common.biz.enums.HttpCodeEnum; import com.bonus.common.biz.enums.LeaseTaskStatusEnum; import com.bonus.common.biz.enums.TmTaskTypeEnum; @@ -124,6 +126,7 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { leaseApplyRequestVo.getLeaseApplyInfo().setCompanyId(leaseDeptInfo.getDeptId()); } try { + int newId = 0; Integer statusFlag = leaseApplyRequestVo.getStatusFlag(); // 根据状态标志选择合适的状态 Integer taskStatus; @@ -165,9 +168,39 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { }); } if(statusFlag!= null && statusFlag == 0){ - sysWorkflowRecordService.addSysWorkflowRecord(tmTask.getTaskId().intValue(),taskCode,19); + newId = sysWorkflowRecordService.addSysWorkflowRecord(tmTask.getTaskId().intValue(),taskCode,19); } if (count > 0) { + if (statusFlag!= null && statusFlag == 0) { + //工单接入 + String id = UUID.randomUUID().toString().replace("-", ""); + WorkApplyInfo workApplyInfo = new WorkApplyInfo(); + workApplyInfo.setId(id); + workApplyInfo.setTitle("智能机具-领料申请待审核"); + workApplyInfo.setCreateUserName(SecurityUtils.getUsername()); + workApplyInfo.setContent(SecurityUtils.getUsername()+":"+leaseApplyRequestVo.getLeaseApplyInfo().getCode()+"-"+leaseApplyRequestVo.getLeaseApplyInfo().getProjectName()); + workApplyInfo.setType(1); + workApplyInfo.setWebAppId("9fa73f046ef520b09e94bbffc3b07702"); + workApplyInfo.setSendUserName(SecurityUtils.getUsername()); + workApplyInfo.setTypeId(1); + workApplyInfo.setBusinessId(String.valueOf(newId)); + workApplyInfo.setNextStatus("待审核"); + workApplyInfo.setFlowState(null); + workApplyInfo.setWebUrl("http://sgwpdm.ah.sgcc.com.cn/iws/mea-h5/#/pages/picking/review/index?appId=9fa73f046ef520b09e94bbffc3b07702"); + int countWork = mapper.insertWorkOrder(workApplyInfo); + if(countWork > 0){ + //接入information_people表 + WorkPeopleInfo workPeopleInfo = new WorkPeopleInfo(); + String idPeople = UUID.randomUUID().toString().replace("-", ""); + workPeopleInfo.setId(idPeople); + workPeopleInfo.setInformationId(id); + workPeopleInfo.setReceiverUsername(SecurityUtils.getUsername()); + workPeopleInfo.setReadState(0); + workPeopleInfo.setHandleState(0); + workPeopleInfo.setIsExamine(0); + int countPeople = mapper.insertWorkPeople(workPeopleInfo); + } + } return insertPurchaseCheckDetails(leaseApplyRequestVo.getLeaseApplyDetailsList(), leaseApplyRequestVo.getLeaseApplyInfo().getId()); } else { return AjaxResult.error("新增任务失败,lease_apply_info表插入0条"); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java index e851db95..81523a9c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java @@ -254,4 +254,15 @@ public class MachineController extends BaseController { { return machineService.synchReport(machine); } + + /** + * 固定资产编号录入 + */ + @ApiOperation(value = "固定资产编号录入") + @PreventRepeatSubmit + @PostMapping("/editAssetsCode") + public AjaxResult editAssetsCode(@RequestBody Machine machine) + { + return toAjax(machineService.editAssetsCode(machine)); + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeKeeperController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeKeeperController.java index 6e4bf4f5..30ff7809 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeKeeperController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeKeeperController.java @@ -127,7 +127,7 @@ public class TypeKeeperController extends BaseController { @PreventRepeatSubmit @RequiresPermissions("ma:keeper:remove") @SysLog(title = "库管员配置", businessType = OperaType.DELETE, logType = 1,module = "物资管理->删除单个库管员配置") - @DeleteMapping + @PostMapping("/unbind") public AjaxResult remove(@RequestBody List typeKeepers) { return toAjax(typeKeeperService.deleteTypeKeeperByUserIdAndTypeId(typeKeepers)); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java index c995da77..106a3c19 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java @@ -141,4 +141,12 @@ public interface MachineMapper * 同步检验报告 */ int updateSynchReport(SampleSync sampleSync); + + /** + * 固定资产编号录入 + * + * @param machine 固定资产编号录入 + * @return 结果 + */ + int editAssetsCode(Machine machine); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/IMachineService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/IMachineService.java index b1d64d6c..2301132d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/IMachineService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/IMachineService.java @@ -107,4 +107,13 @@ public interface IMachineService * @return 结果 */ public AjaxResult synchReport(Machine machine); + + /** + * 固定资产编号录入 + * + * @param machine 固定资产编号录入 + * @return 结果 + */ + public int editAssetsCode(Machine machine); + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java index dea2ef9e..b539f6e7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java @@ -302,4 +302,11 @@ public class MachineServiceImpl implements IMachineService } } + @Override + public int editAssetsCode(Machine machine) + { + machine.setCreateTime(DateUtils.getNowDate()); + return machineMapper.editAssetsCode(machine); + } + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/main/controller/MainController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/main/controller/MainController.java index 1d69a816..0c44076d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/main/controller/MainController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/main/controller/MainController.java @@ -35,16 +35,16 @@ public class MainController { try { //需求量 BigDecimal demandNum = mainService.getDemandNum(demandAndSupplyVo); - //需求增长量 - BigDecimal demandIncrease = mainService.getDemandIncrease(demandAndSupplyVo); +// //需求增长量 +// BigDecimal demandIncrease = mainService.getDemandIncrease(demandAndSupplyVo); //已供应数量 BigDecimal suppliedQuantityNum = mainService.getSuppliedQuantityNum(demandAndSupplyVo); - //已供应增长量 - BigDecimal suppliedQuantityIncrease = mainService.getSuppliedQuantityIncrease(demandAndSupplyVo); +// //已供应增长量 +// BigDecimal suppliedQuantityIncrease = mainService.getSuppliedQuantityIncrease(demandAndSupplyVo); //待供应量 BigDecimal suppliedToBeQuantityNum = mainService.getSuppliedToBeQuantityNum(demandAndSupplyVo); - //待供应量增长量 - BigDecimal suppliedToBeQuantityIncrease = mainService.getSuppliedToBeQuantityIncrease(demandAndSupplyVo); +// //待供应量增长量 +// BigDecimal suppliedToBeQuantityIncrease = mainService.getSuppliedToBeQuantityIncrease(demandAndSupplyVo); //获取未结算工程总数量 Integer projectNum = mainService.getProjectNum(demandAndSupplyVo); //供应总件数(机具出库数量，不带条件查询) @@ -52,11 +52,11 @@ public class MainController { // 供应总价值 BigDecimal suppliedQuantityPrice = mainService.getSuppliedQuantityPrice(new DemandAndSupplyVo()); demandAndSupplyVoRes.setDemandNum(demandNum); - demandAndSupplyVoRes.setDemandIncrease(demandIncrease); +// demandAndSupplyVoRes.setDemandIncrease(demandIncrease); demandAndSupplyVoRes.setSuppliedQuantityNum(suppliedQuantityNum); - demandAndSupplyVoRes.setSuppliedQuantityIncrease(suppliedQuantityIncrease); +// demandAndSupplyVoRes.setSuppliedQuantityIncrease(suppliedQuantityIncrease); demandAndSupplyVoRes.setSuppliedToBeQuantityNum(suppliedToBeQuantityNum); - demandAndSupplyVoRes.setSuppliedToBeQuantityIncrease(suppliedToBeQuantityIncrease); +// demandAndSupplyVoRes.setSuppliedToBeQuantityIncrease(suppliedToBeQuantityIncrease); demandAndSupplyVoRes.setProjectNum(projectNum); demandAndSupplyVoRes.setSuppliedQuantityAllNum(outNum); demandAndSupplyVoRes.setSuppliedQuantityPrice(suppliedQuantityPrice); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/main/service/impl/MainServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/main/service/impl/MainServiceImpl.java index 1961dd33..bfb14d35 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/main/service/impl/MainServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/main/service/impl/MainServiceImpl.java @@ -239,14 +239,14 @@ public class MainServiceImpl implements MainService { LocalDate lastMonthEnd = endDate.minusMonths(1); dto.setStartTime(lastMonthStart.format(formatter)); dto.setEndTime(lastMonthEnd.format(formatter)); - MaTypeHomeVo lastMonthResultVo = mainMapper.getInStockNum(dto); +// MaTypeHomeVo lastMonthResultVo = mainMapper.getInStockNum(dto); // 计算各项增长量 - resultVo.setInStockIncrease(calculateIncrease(resultVo.getInStockNum(), lastMonthResultVo.getInStockNum())); - resultVo.setInUseIncrease(calculateIncrease(resultVo.getInUseNum(), lastMonthResultVo.getInUseNum())); - resultVo.setInRepairIncrease(calculateIncrease(resultVo.getInRepairNum(), lastMonthResultVo.getInRepairNum())); - resultVo.setNewPurchaseIncrease(calculateIncrease(resultVo.getNewPurchaseNum(), lastMonthResultVo.getNewPurchaseNum())); - resultVo.setNewRepairIncrease(calculateIncrease(resultVo.getNewRepairNum(), lastMonthResultVo.getNewRepairNum())); +// resultVo.setInStockIncrease(calculateIncrease(resultVo.getInStockNum(), lastMonthResultVo.getInStockNum())); +// resultVo.setInUseIncrease(calculateIncrease(resultVo.getInUseNum(), lastMonthResultVo.getInUseNum())); +// resultVo.setInRepairIncrease(calculateIncrease(resultVo.getInRepairNum(), lastMonthResultVo.getInRepairNum())); +// resultVo.setNewPurchaseIncrease(calculateIncrease(resultVo.getNewPurchaseNum(), lastMonthResultVo.getNewPurchaseNum())); +// resultVo.setNewRepairIncrease(calculateIncrease(resultVo.getNewRepairNum(), lastMonthResultVo.getNewRepairNum())); } catch (Exception e) { // 处理日期解析异常 throw new RuntimeException("日期解析出错", e); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordServiceImpl.java index d189dee0..5df5ac52 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordServiceImpl.java @@ -52,6 +52,8 @@ public class SysWorkflowRecordServiceImpl implements SysWorkflowRecordService { sysWorkflowRecord.setTaskCode(taskCode); //创建审批任务 int count = sysWorkflowRecordMapper.addSysWorkflowRecord(sysWorkflowRecord); + // 获取新创建的ID + int newId = sysWorkflowRecord.getId(); //获取当前审核流下的节点 SysWorkflowNode sysWorkflowNode = new SysWorkflowNode(); sysWorkflowNode.setTypeId(sysWorkflowType.getId()); @@ -65,6 +67,6 @@ public class SysWorkflowRecordServiceImpl implements SysWorkflowRecordService { sysWorkflowRecordHistory.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString()); sysWorkflowRecordHistory.setCreateTime(DateUtils.getNowDate()); sysWorkflowRecordHistoryMapper.addSysWorkflowRecordHistory(sysWorkflowRecordHistory); - return count; + return newId; } } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml index b5da7296..b903d7f6 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml @@ -853,4 +853,97 @@ where task_id = #{taskId} + + + insert into uni_org.sys_information_people + + create_time, + update_time, + information_id, + read_state, + handle_state, + receiver_username, + update_user, + is_examine, + + + + #{parentId}, + now(), + now(), + #{informationId}, + #{readState}, + #{handleState}, + #{receiverUsername}, + #{updateUser}, + #{isExample}, + + + + + insert into uni_org.sys_information + + id, + create_time, + create_user_name, + title, + content, + web_app_id, + type, + extend, + send_user_name, + web_url, + type_id, + business_id, + flow_state, + rout, + next_status, + extend_name, + + + #{id}, + now(), + #{createUserName}, + #{title}, + #{content}, + #{webAppId}, + #{type}, + #{extend}, + #{sendUserName}, + #{webUrl}, + #{typeId}, + #{businessId}, + #{flowState}, + #{rout}, + #{nextStatus}, + #{extendName}, + + + + + insert into uni_org.sys_information_people + + id, + create_time, + update_time, + information_id, + read_state, + handle_state, + receiver_username, + update_user, + is_examine, + + + + #{id}, + now(), + #{updateTime}, + #{informationId}, + #{readState}, + #{handleState}, + #{receiverUsername}, + #{updateUser}, + #{isExamine}, + + diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml index cc46871f..18234418 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml @@ -171,7 +171,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ma.erp_code as erpCode, ma.transfer_code as transferCode, ma.in_out_num as inOutNum, - ma.buy_task as buyTask, + tt.code as buyTask, ma.own_house as ownHouse, ma.company_id as companyId, ma.create_time as createTime, @@ -201,6 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_type_repair mtr on ma.type_id = mtr.type_id LEFT JOIN sys_user su2 on mtr.user_id = su2.user_id LEFT JOIN bm_asset_attributes baa on ma.assets_id = baa.id + LEFT JOIN tm_task tt on tt.task_id=ma.buy_task where ma.ma_id = #{maId} @@ -493,4 +494,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where ma_code = #{selfCode} + + + update ma_machine + SET + assets_code = #{assetsCode} + where ma_id = #{maId} + \ No newline at end of file