合同类型调整

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

@@ -6,12 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
 
-import com.jeeplus.assess.workContract.domain.WorkContractInfo;
-import com.jeeplus.business.workClientInfo.domain.JyWorkClientInfo;
-import com.jeeplus.business.workClientInfo.mapper.JyWorkClientInfoMapper;
 import com.jeeplus.business.workContractInfo.domain.JyContractParticipant;
 import com.jeeplus.business.workContractInfo.domain.JyWorkContractInfo;
 import com.jeeplus.business.workContractInfo.mapper.JyContractParticipantMapper;
@@ -24,41 +19,24 @@ import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
-import freemarker.template.utility.StringUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.math3.geometry.spherical.oned.ArcsSet;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.lang.reflect.Array;
 import java.util.*;
 
-//import com.jeeplus.sys.utils.UserUtils;
-//import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
-//import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-//import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
-
 @Service
 public class JyWorkContractService {
 
     @Resource
     private JyWorkContractInfoMapper jyWorkContractInfoMapper;
 
-//    @Resource
-//    private OssServiceMapper ossServiceMapper;
-
-//    @Resource
-//    private SerialnumTplService serialnumTplService;
-
     @Resource
     private JyContractParticipantMapper jyContractParticipantMapper;
 
     @Resource
-    private JyWorkClientInfoMapper jyWorkClientInfoMapper;
-
-    @Resource
     private IFlowableApi flowTaskService;
 
     public String saveInfo(JyWorkContractInfoDto workContractInfoDto) throws Exception {
@@ -312,6 +290,9 @@ public class JyWorkContractService {
                     stringList.add(info.getContractType());
                 }
             }
+
+            List<String> result = Arrays.asList(dto.getContractType().split(","));
+            dto.setContractTypeList(result);
             ArrayList<List<String>> jyWorkContractInfos = new ArrayList<>();
             jyWorkContractInfos.add(stringList);
             dto.setContractTypes(jyWorkContractInfos);

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workContractInfo/service/dto/JyWorkContractInfoDto.java

@@ -81,6 +81,7 @@ public class JyWorkContractInfoDto extends BaseDTO {
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
     private List<List<String>> contractTypes;
+    private List<String> contractTypeList;
     private String contractType;