From e9571c97f095732efccdeedb81e2de922a9e2492 Mon Sep 17 00:00:00 2001 From: mythxb Date: Thu, 17 Aug 2023 17:14:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B1=A5=E8=81=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/user/dto/AddPerformRecordDto.java | 3 +-- .../rzyc/mapper/user/ListDetailMapper.java | 4 ++++ .../java/com/rzyc/model/user/ListDetail.java | 11 ++++++++++ .../mapper/user/ListDetailMapper.xml | 20 +++++++++++++++++-- .../java/com/rzyc/advice/Swagger2Config.java | 2 +- .../com/rzyc/controller/DataController.java | 6 ++++++ .../rzyc/controller/PcPersonalController.java | 10 +++++++++- 7 files changed, 50 insertions(+), 6 deletions(-) diff --git a/inventory-dao/src/main/java/com/rzyc/bean/user/dto/AddPerformRecordDto.java b/inventory-dao/src/main/java/com/rzyc/bean/user/dto/AddPerformRecordDto.java index a3862c5..a496691 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/user/dto/AddPerformRecordDto.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/user/dto/AddPerformRecordDto.java @@ -20,8 +20,7 @@ public class AddPerformRecordDto { @ApiModelProperty(value = "用户id",required = true) private String sysUserId; - @NotNull(message = "工作摘要不能为空") - @ApiModelProperty(value = "工作摘要",required = true) + @ApiModelProperty(value = "工作摘要") private String worktitle; diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/user/ListDetailMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/user/ListDetailMapper.java index f6cac5d..3a715eb 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/user/ListDetailMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/user/ListDetailMapper.java @@ -70,4 +70,8 @@ public interface ListDetailMapper { /*查询所有*/ List findAll(); + /*修改岗位id*/ + Integer changeListPerformId(@Param("listDetailId") String listDetailId, + @Param("performId") String performId); + } diff --git a/inventory-dao/src/main/java/com/rzyc/model/user/ListDetail.java b/inventory-dao/src/main/java/com/rzyc/model/user/ListDetail.java index d85087f..7f2e4ab 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/user/ListDetail.java +++ b/inventory-dao/src/main/java/com/rzyc/model/user/ListDetail.java @@ -23,6 +23,9 @@ public class ListDetail implements Serializable { @ApiModelProperty("清单id") private String listfactorid; + @ApiModelProperty("岗位id") + private String listperformid; + @ApiModelProperty("用户id") private String sysUserId; @@ -89,6 +92,14 @@ public class ListDetail implements Serializable { private static final long serialVersionUID = 1L; + public String getListperformid() { + return listperformid; + } + + public void setListperformid(String listperformid) { + this.listperformid = listperformid; + } + public List getFactors() { return factors; } diff --git a/inventory-dao/src/main/resources/mapper/user/ListDetailMapper.xml b/inventory-dao/src/main/resources/mapper/user/ListDetailMapper.xml index da7cddf..45a7eb1 100644 --- a/inventory-dao/src/main/resources/mapper/user/ListDetailMapper.xml +++ b/inventory-dao/src/main/resources/mapper/user/ListDetailMapper.xml @@ -4,6 +4,7 @@ + @@ -81,7 +82,7 @@ - ListDetailId, ListFactorId, WorkTitle, StartTime, EndTime, OTCType, OTCId, IsFinish, + ListDetailId, ListFactorId, ListPerformId,WorkTitle, StartTime, EndTime, OTCType, OTCId, IsFinish, FinishTime, CreatedOn, CreatedBy, ModifiedOn, ModifiedBy @@ -144,7 +145,7 @@ - insert into ListDetail (ListDetailId, ListFactorId, SysUserId,WorkTitle, + insert into ListDetail (ListDetailId, ListFactorId, ListPerformId,SysUserId,WorkTitle, StartTime, EndTime, OTCType,task_id, OTCId, IsFinish, del_state,FinishTime, CreatedOn, CreatedBy, ModifiedOn, @@ -152,6 +153,7 @@ ) values (#{listdetailid,jdbcType=VARCHAR}, #{listfactorid,jdbcType=VARCHAR}, + #{listperformid,jdbcType=VARCHAR}, #{sysUserId,jdbcType=VARCHAR}, #{worktitle,jdbcType=VARCHAR}, #{starttime,jdbcType=TIMESTAMP}, #{endtime,jdbcType=TIMESTAMP}, @@ -502,6 +504,15 @@ + + + SELECT * FROM `listdetail` ld + + + + UPDATE listdetail SET ListPerformId = #{performId} WHERE ListDetailId = #{listDetailId} + diff --git a/inventory-gov/src/main/java/com/rzyc/advice/Swagger2Config.java b/inventory-gov/src/main/java/com/rzyc/advice/Swagger2Config.java index fecc317..4b86e08 100644 --- a/inventory-gov/src/main/java/com/rzyc/advice/Swagger2Config.java +++ b/inventory-gov/src/main/java/com/rzyc/advice/Swagger2Config.java @@ -26,7 +26,7 @@ import java.util.List; @Configuration @EnableSwagger2 @EnableSwaggerBootstrapUI -@Profile({"dev","test"}) +@Profile({"dev","test","yun"}) public class Swagger2Config { /** diff --git a/inventory-gov/src/main/java/com/rzyc/controller/DataController.java b/inventory-gov/src/main/java/com/rzyc/controller/DataController.java index 7506ee9..b09a18d 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/DataController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/DataController.java @@ -1177,6 +1177,12 @@ public class DataController extends com.rzyc.controller.BaseController { relation.setModifyTime(new Date()); relation.setModifyBy("导入"); listRelationMapper.insert(relation); + + SysUser sysUser = sysUserMapper.selectByPrimaryKey(listDetail.getSysUserId()); + if(null != sysUser){ + listDetailMapper.changeListPerformId(listDetail.getListdetailid(),sysUser.getSystitle()); + } + } return result; } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java index e1ca211..5847132 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java @@ -1271,13 +1271,21 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { listDetail.setEndtime(DateUtils.parseString2Date(addPerformRecordDto.getEndTime(),"yyyy-MM-dd")); listDetail.setFinishtime(listDetail.getEndtime()); - String chinaName = getChinaName(); + String userId = getUserId(); + String chinaName = userId; System.out.println("chinaName -> "+chinaName); listDetail.setCreatedby(chinaName); listDetail.setModifiedby(chinaName); listDetail.setTaskId(addPerformRecordDto.getTaskId()); listDetail.setIsfinish(IsFinish.YES.getFinish()); listDetail.setDelState(DelState.NOT_DEL.getState()); + + //获取岗位id + SysUser sysUser = getUser(userId); + if(null != sysUser){ + listDetail.setListperformid(sysUser.getSystitle()); + } + listDetailMapper.insert(listDetail); //清单id 多个逗号隔开