浏览代码

合同调整

sangwenwei 7 月之前
父节点
当前提交
89b9e711d2

+ 1 - 0
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workContractInfo/domain/JyWorkContractInfo.java

@@ -77,6 +77,7 @@ public class JyWorkContractInfo extends BaseEntity {
      * 合同类型(大类)
      */
     private String contractTypeFirst;
+    @TableField(exist = false)
     private String contractTypeFirstValue;
     @TableField(exist = false)
     private List<String> contractTypes;

+ 1 - 0
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workContractInfo/service/JyWorkContractService.java

@@ -284,6 +284,7 @@ public class JyWorkContractService {
         info.setUpdateById(userDTO.getId());
         info.setUpdateTime(new Date());
         info.setStatus("5");
+        info.setFiledType("5");
         if (StringUtils.isBlank(workContractInfoDto.getContractNo())){
             //合同编号生成
             List<List<String>> contractTypes = new ArrayList<>();

+ 1 - 1
jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/modules/flowable/listener/JyProjectExecutionListener.java

@@ -76,7 +76,7 @@ public class JyProjectExecutionListener implements ExecutionListener {
 
                 UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getById(flow.getAssigneeId());
                 //获取到岗位为办公室下的人员信息
-                PostDTO postDTOByName = SpringUtil.getBean(IPostApi.class).getPostDTOByName("办公室(嘉溢)");
+                PostDTO postDTOByName = SpringUtil.getBean(IPostApi.class).getPostDTOByName("办公室");
                 List<UserDTO> listByPostId = SpringUtil.getBean(IUserApi.class).findListByPostId(postDTOByName.getId());
                 String finalTitleName = titleName;
                 listByPostId.stream().forEach(item->{