增加续保接口配置，增加配置保险公司魔板配置

pom.xml

@@ -12,16 +12,13 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.5.14</version>
-<!--        <version>2.1.9.RELEASE</version>-->
         <relativePath/>
-
     </parent>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-<!--        <swagger.version>2.9.2</swagger.version>-->
         <druid.version>1.1.10</druid.version>
         <jwt.version>0.9.1</jwt.version>
         <fastjson.version>1.2.58</fastjson.version>

src/main/java/com/ydtech/SpringInsApplication.java

@@ -6,10 +6,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.TreeMap;
-
 
 //打成war包时的代码 配合pom.xml中的配置
 //参考：https://blog.csdn.net/qq_33512843/article/details/80951741
@@ -38,8 +34,8 @@ import java.util.TreeMap;
 @EnableCaching
 public class SpringInsApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(SpringInsApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(SpringInsApplication.class, args);
+    }
 
 }

src/main/java/com/ydtech/aop/RequestStringParamHandlerMethodArgumentResolver.java

@@ -22,6 +22,7 @@ public class RequestStringParamHandlerMethodArgumentResolver implements HandlerM
     public Object resolveArgument(MethodParameter methodParameter, ModelAndViewContainer modelAndViewContainer, NativeWebRequest nativeWebRequest, WebDataBinderFactory webDataBinderFactory) throws Exception {
         RequestSingleParam requestSingleParam = methodParameter.getParameterAnnotation(RequestSingleParam.class);
         HttpServletRequest request = nativeWebRequest.getNativeRequest(HttpServletRequest.class);
+        assert request != null;
         BufferedReader reader = request.getReader();
         StringBuilder sb = new StringBuilder();
         char[] buf = new char[1024];
@@ -33,4 +34,5 @@ public class RequestStringParamHandlerMethodArgumentResolver implements HandlerM
         JSONObject jsonObject = JSONObject.parseObject(sb.toString());
         return jsonObject.get(value);
     }
+
 }

src/main/java/com/ydtech/aop/request/DictEnum.java

@@ -3,14 +3,13 @@ package com.ydtech.aop.request;
 import java.lang.annotation.*;
 
 
-
 /**
- *
  * 枚举类  字典注解
+ *
  * @author: lig
  * @date: 2023年04月10日 0010
  */
-@Target({ElementType.METHOD,ElementType.TYPE})
+@Target({ElementType.METHOD, ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
 @Documented
@@ -20,11 +19,11 @@ public @interface DictEnum {
      * 字典标识
      */
     String key() default "";
+
     /**
      * 字典标识名称
      */
     String desc() default "";
 
 
-
 }

src/main/java/com/ydtech/components/AnShengRequestComponents.java

@@ -28,11 +28,11 @@ public class AnShengRequestComponents {
     }
 
     public <T, B> B audit(T t, Class<B> responseType) {
-        return renbaoRequestComponents.post(asDomain + asAuditUrl,"安盛天平核保", t, responseType);
+        return renbaoRequestComponents.post(asDomain + asAuditUrl, "安盛天平核保", t, responseType);
     }
 
     public <T, B> B submitImage(T t, Class<B> responseType) {
-        return renbaoRequestComponents.post(asDomain + asImageUrl,"安盛天平上传影像", t, responseType);
+        return renbaoRequestComponents.post(asDomain + asImageUrl, "安盛天平上传影像", t, responseType);
     }
 
 }

src/main/java/com/ydtech/components/HengbangRequestComponents.java

@@ -33,19 +33,19 @@ public class HengbangRequestComponents {
     }
 
     public <T, B> B quote(T t, Class<B> responseType) {
-        return renbaoRequestComponents.post(hbQuoteUrl,"恒邦报价", t, responseType);
+        return renbaoRequestComponents.post(hbQuoteUrl, "恒邦报价", t, responseType);
     }
 
     public <T, B> B audit(T t, Class<B> responseType) {
-        return renbaoRequestComponents.post(hbAuditUrl,"恒邦核保", t, responseType);
+        return renbaoRequestComponents.post(hbAuditUrl, "恒邦核保", t, responseType);
     }
 
     public <T, B> B submitImage(T t, Class<B> responseType) {
-        return renbaoRequestComponents.post(hbImageUrl,"恒邦上传影响", t, responseType);
+        return renbaoRequestComponents.post(hbImageUrl, "恒邦上传影响", t, responseType);
     }
 
     public <T, B> B getPolicyPrint(T t, Class<B> responseType) {
-        return renbaoRequestComponents.post(hbPolicyPrintUrl,"获取电子保单",t, responseType);
+        return renbaoRequestComponents.post(hbPolicyPrintUrl, "获取电子保单", t, responseType);
     }
 
 }

src/main/java/com/ydtech/components/InsTaskHistoryComponents.java

@@ -44,7 +44,7 @@ public class InsTaskHistoryComponents {
      *
      * @param insOrderStatus 订单状态
      * @param insAreaCompany 子订单
-     * @param insOrder 总订单
+     * @param insOrder       总订单
      */
     public void modifyOrderStatus(InsOrderStatus insOrderStatus, InsAreaCompany insAreaCompany, InsOrders insOrder) {
         InsTaskHistory history7 = new InsTaskHistory();

src/main/java/com/ydtech/components/MyJedisPoolConfig.java

@@ -7,7 +7,7 @@ import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
 
 /**
- *  jedisPool的配置
+ * jedisPool的配置
  *
  * @author: lig
  * @date: 2023年03月13日 0013
@@ -62,7 +62,7 @@ public class MyJedisPoolConfig {
 
         //静态内部类保存一个jedisPool的实例
 //        private static JedisPool jedisPool = null;
-        private static JedisPool jedisPool = new JedisPool(getConfig(), host, port, connAndReadWriteTimeOut, StringUtils.isNotEmpty(auth)?auth:null);
+        private static JedisPool jedisPool = new JedisPool(getConfig(), host, port, connAndReadWriteTimeOut, StringUtils.isNotEmpty(auth) ? auth : null);
 
 
         private static JedisPoolConfig getConfig() {

src/main/java/com/ydtech/components/OrderComponents.java

@@ -462,6 +462,4 @@ public class OrderComponents {
     }
 
 
-
-
 }

src/main/java/com/ydtech/components/RenbaoRequestComponents.java

@@ -35,7 +35,7 @@ public class RenbaoRequestComponents {
     private String rbBrandSearchUrl;
 
 //    @MethodLogAnnotation(title = "报价-请求python")
-    public <T, B> B post(String url,String message, @Nullable T requestBody, Class<B> responseType) {
+    public <T, B> B post(String url, String message, @Nullable T requestBody, Class<B> responseType) {
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.setContentType(MediaType.APPLICATION_JSON);
         HttpEntity<T> yaQuoteInfoVoHttpEntity = new HttpEntity<>(requestBody, httpHeaders);
@@ -49,19 +49,19 @@ public class RenbaoRequestComponents {
     }
 
     public <T, B> B quote(T t, Class<B> responseType) {
-        return post(rbQuoteUrl,"人保报价", t, responseType);
+        return post(rbQuoteUrl, "人保报价", t, responseType);
     }
 
     public <T, B> B audit(T t, Class<B> responseType) {
-        return post(rbAuditUrl, "人保核保",t, responseType);
+        return post(rbAuditUrl, "人保核保", t, responseType);
     }
 
     public <T, B> B licensePlateQuery(T t, Class<B> responseType) {
-        return post(rbCarSearchUrl,"人保车牌号查询车辆信息", t, responseType);
+        return post(rbCarSearchUrl, "人保车牌号查询车辆信息", t, responseType);
     }
 
     public <T, B> B modelsQuery(T t, Class<B> responseType) {
-        return post(rbBrandSearchUrl,"人保车辆查询", t, responseType);
+        return post(rbBrandSearchUrl, "人保车辆查询", t, responseType);
     }
 
 }

src/main/java/com/ydtech/components/YongchengRequestComponents.java

@@ -30,19 +30,19 @@ public class YongchengRequestComponents {
 
 
     public <T, B> B quote(T t, Class<B> responseType) {
-        return renbaoRequestComponents.post(ycDomain + ycQuoteUrl, "永诚报价",t, responseType);
+        return renbaoRequestComponents.post(ycDomain + ycQuoteUrl, "永诚报价", t, responseType);
     }
 
     public <T, B> B audit(T t, Class<B> responseType) {
-        return renbaoRequestComponents.post(ycDomain + ycAuditUrl,"永诚核保", t, responseType);
+        return renbaoRequestComponents.post(ycDomain + ycAuditUrl, "永诚核保", t, responseType);
     }
 
     public <T, B> B submitImage(T t, Class<B> responseType) {
-        return renbaoRequestComponents.post(ycDomain + ycImageUrl,"永诚上传影像", t, responseType);
+        return renbaoRequestComponents.post(ycDomain + ycImageUrl, "永诚上传影像", t, responseType);
     }
 
     public <T, B> B getPolicyPrint(T t, Class<B> responseType) {
-        return renbaoRequestComponents.post(ycDomain + ycPolicyPrintUrl,"永诚获取电子保单", t, responseType);
+        return renbaoRequestComponents.post(ycDomain + ycPolicyPrintUrl, "永诚获取电子保单", t, responseType);
     }
 
 }

src/main/java/com/ydtech/components/scheduler/SchedulerTask.java

@@ -15,7 +15,7 @@ import java.util.List;
 @Data
 @Component
 @Slf4j
-public class SchedulerTask{
+public class SchedulerTask {
 
     @Autowired
     private InsAreaCompanyService insAreaCompanyService;

src/main/java/com/ydtech/config/DictEnumConfig.java

@@ -15,7 +15,7 @@ import java.util.stream.Collectors;
 
 
 /**
- *  枚举类  字典配置
+ * 枚举类  字典配置
  *
  * @author: lig
  * @date: 2023年04月10日 0010
@@ -31,7 +31,7 @@ public class DictEnumConfig implements InitializingBean {
     }
 
 
-    public static List<DictionaryManagement> dictManageList ;
+    public static List<DictionaryManagement> dictManageList;
 
 
     private static void setDmMap(Map<String, DictionaryManagement> dmMap) {

src/main/java/com/ydtech/config/MvcConfig.java

@@ -21,8 +21,6 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 @Configuration

src/main/java/com/ydtech/config/SwaggerConfig.java

@@ -12,7 +12,6 @@ import springfox.documentation.service.*;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spi.service.contexts.SecurityContext;
 import springfox.documentation.spring.web.plugins.Docket;
-//import springfox.documentation.swagger2.annotations.EnableSwagger2;
 import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
 import java.util.ArrayList;
@@ -50,6 +49,7 @@ public class SwaggerConfig {
                 .securityContexts(securityContexts());
 
     }
+
     @Bean(value = "esmApi")
     @Order(value = 2)
     public Docket esmApi() {
@@ -179,6 +179,7 @@ public class SwaggerConfig {
                 .securityContexts(securityContexts());
 
     }
+
     @Bean(value = "orderApi")
     @Order(value = 6)
     public Docket orderApi() {
@@ -255,6 +256,7 @@ public class SwaggerConfig {
                 .forPaths(PathSelectors.regex("^(?!auth).*$")).build());
         return securityContexts;
     }
+
     private List<SecurityReference> defaultAuth() {
         AuthorizationScope authorizationScope = new AuthorizationScope("global", "描述信息");
         AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
@@ -265,7 +267,4 @@ public class SwaggerConfig {
     }
 
 
-
-
-
 }

src/main/java/com/ydtech/config/properties/ZmApiConfigurationProperties.java

@@ -36,7 +36,6 @@ public class ZmApiConfigurationProperties {
     private String passMsgUrl;
 
 
-
     /**
      * 中煤请求 head 的参数
      *

src/main/java/com/ydtech/constants/enums/InsOrderStatus.java

@@ -32,9 +32,6 @@ public enum InsOrderStatus {
     S_4("4", "核保退回"),
 
 
-
-
-
     ;
 
     public static InsOrderStatus matchKey(String key) {
@@ -56,5 +53,4 @@ public enum InsOrderStatus {
     private String desc;
 
 
-
 }

src/main/java/com/ydtech/constants/enums/InsQuoteFlow.java

@@ -14,12 +14,12 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum InsQuoteFlow {
 
-    Q_S_0( "报价"),
-    Q_S_1( "核保"),
-    Q_S_2( "影像上传"),
-    Q_S_3( "缴费"),
-    Q_S_4( "查看保单"),
-    Q_S_5( "补传回调"),
+    Q_S_0("报价"),
+    Q_S_1("核保"),
+    Q_S_2("影像上传"),
+    Q_S_3("缴费"),
+    Q_S_4("查看保单"),
+    Q_S_5("补传回调"),
 
     ;
 

src/main/java/com/ydtech/constants/enums/InsurKind.java

@@ -6,7 +6,6 @@ import lombok.Getter;
 
 /**
  * @description: 险种   保险种类
- *
  * @author: lig
  * @date: 2023年02月10日 0010
  */

src/main/java/com/ydtech/constants/enums/dict/AttachInsureEnum.java

@@ -16,7 +16,7 @@ import lombok.Getter;
 @DictEnum(key = "attach_insure", desc = "保险 - 附加险类型")
 public enum AttachInsureEnum implements IBaseEnum {
 
-    AI001("1", "驾驶员意外险",1,0),
+    AI001("1", "驾驶员意外险", 1, 0),
     ;
 
     private String code;
@@ -27,5 +27,4 @@ public enum AttachInsureEnum implements IBaseEnum {
     private Integer status;
 
 
-
 }

src/main/java/com/ydtech/constants/enums/dict/DictionaryData.java

@@ -28,5 +28,4 @@ public class DictionaryData {
     private Integer status;
 
 
-
 }

src/main/java/com/ydtech/constants/enums/dict/DictionaryManagement.java

@@ -34,5 +34,4 @@ public class DictionaryManagement {
 //    private Boolean enumFlag = Boolean.FALSE;
 
 
-
 }

src/main/java/com/ydtech/constants/enums/dict/EnumUtils.java

@@ -8,12 +8,13 @@ import java.util.Optional;
 import java.util.stream.Stream;
 
 
-public class EnumUtils{
+public class EnumUtils {
 
     /**
      * 根据枚举值获取枚举
+     *
      * @param baseEnumClass 枚举类
-     * @param value 枚举值
+     * @param value         枚举值
      * @return 枚举
      */
     public static <T extends IBaseEnum> T select(Class<T> baseEnumClass, String value) {
@@ -25,8 +26,9 @@ public class EnumUtils{
 
     /**
      * 根据枚举值获取枚举描述
+     *
      * @param baseEnumClass 枚举类
-     * @param value 枚举值
+     * @param value         枚举值
      * @return 枚举描述
      */
     public static <T extends IBaseEnum> String getDescByKey(Class<T> baseEnumClass, String value) {
@@ -34,5 +36,4 @@ public class EnumUtils{
     }
 
 
-
 }

src/main/java/com/ydtech/constants/enums/dict/GenderEnum.java

@@ -16,9 +16,9 @@ import lombok.Getter;
 @DictEnum(key = "gender", desc = "性别")
 public enum GenderEnum implements IBaseEnum {
 
-    MAN("1", "男",1,0),
-    WOMAN("2", "女",2,0),
-    OTHERS("3", "其他",3,0);
+    MAN("1", "男", 1, 0),
+    WOMAN("2", "女", 2, 0),
+    OTHERS("3", "其他", 3, 0);
 
     private String code;
     private String desc;
@@ -28,5 +28,4 @@ public enum GenderEnum implements IBaseEnum {
     private Integer status;
 
 
-
 }

src/main/java/com/ydtech/constants/enums/dict/IBaseEnum.java

@@ -1,11 +1,11 @@
 package com.ydtech.constants.enums.dict;
 
 
-
 public interface IBaseEnum {
 
     /**
      * 获取枚举描述
+     *
      * @return 枚举描述
      */
     String getDesc();
@@ -17,6 +17,4 @@ public interface IBaseEnum {
     Integer getStatus();
 
 
-
-
 }

src/main/java/com/ydtech/constants/enums/dict/InsOrderStatusEnum.java

@@ -11,24 +11,23 @@ import lombok.Getter;
 public enum InsOrderStatusEnum implements IBaseEnum {
 
     //所有未提交核保的均为报价中（包括拒保订单 ）
-    QUOTE_ING("0", "报价中",1,0),
+    QUOTE_ING("0", "报价中", 1, 0),
 
     //已提交核保，并转人工核保状态
-    WAIT_AUDIT("1", "待核保",2,0),
+    WAIT_AUDIT("1", "待核保", 2, 0),
 
     //自动核保或者人工核保审核通过
-    WAIT_PAY("2", "已核保待缴费",3,0),
+    WAIT_PAY("2", "已核保待缴费", 3, 0),
 
     //客户缴费完成生成保单状态
-    ACCEPT_INSURANCE("3", "已承保",4,0),
+    ACCEPT_INSURANCE("3", "已承保", 4, 0),
 
     //人工核保退回状态，直至再次提交核保，状态修改为待核保
-    TO_BACK("4", "核保退回",6,0),
+    TO_BACK("4", "核保退回", 6, 0),
 
     ;
 
 
-
     private String code;
     private String desc;
     //排序
@@ -37,5 +36,4 @@ public enum InsOrderStatusEnum implements IBaseEnum {
     private Integer status;
 
 
-
 }

src/main/java/com/ydtech/constants/enums/dict/WhetherEnum.java

@@ -16,8 +16,8 @@ import lombok.Getter;
 @DictEnum(key = "whether", desc = "是否")
 public enum WhetherEnum implements IBaseEnum {
 
-    NO("0", "否",1,0),
-    YES("1", "是",2,0),
+    NO("0", "否", 1, 0),
+    YES("1", "是", 2, 0),
     ;
 
     private String code;
@@ -28,5 +28,4 @@ public enum WhetherEnum implements IBaseEnum {
     private Integer status;
 
 
-
 }

src/main/java/com/ydtech/core/page/BaseController.java

@@ -3,7 +3,6 @@ package com.ydtech.core.page;
 
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.security.JwtAuthenticatioToken;
-import com.ydtech.security.JwtUserDetails;
 import com.ydtech.security.utils.JwtTokenUtils;
 import com.ydtech.security.utils.SecurityUtils;
 import org.springframework.security.core.Authentication;
@@ -33,8 +32,6 @@ public class BaseController {
     }
 
 
-
-
 //    /**
 //     * 获取过滤字段的值
 //     *
@@ -73,7 +70,7 @@ public class BaseController {
 
 
     /**
-     *  新加 可用
+     * 新加 可用
      *
      * @author: lig
      * @date: 2023年05月18日 0018
@@ -82,7 +79,6 @@ public class BaseController {
         Authentication authentication = SecurityUtils.getAuthentication();
         JwtAuthenticatioToken j = (JwtAuthenticatioToken) authentication;
         return JwtTokenUtils.getUserIdFromToken(j.getToken());
-
     }
 
     /**

src/main/java/com/ydtech/core/page/HttpResult.java

@@ -1,7 +1,6 @@
 package com.ydtech.core.page;
 
 
-
 /**
  * HTTP结果封装
  *

src/main/java/com/ydtech/core/page/PageRequest.java

@@ -57,7 +57,7 @@ public class PageRequest {
     }
 
 
-    public static Page<T>  buildPageRequest(PageRequest pageRequest){
+    public static Page<T> buildPageRequest(PageRequest pageRequest) {
         int pageNum = Math.max(pageRequest.getPageNum(), 1);
         int pageSize = Math.max(pageRequest.getPageSize(), 1);
 

src/main/java/com/ydtech/modules/admin/controller/AppLoginController.java

@@ -13,7 +13,7 @@ import com.ydtech.modules.esm.model.EsmOfferChannel;
 import com.ydtech.modules.esm.model.EsmUserInternal;
 import com.ydtech.modules.esm.service.EsmOfferChannelService;
 import com.ydtech.modules.esm.service.EsmUserInternalService;
-import com.ydtech.modules.esm.vo.EsmUserInternalVo;
+import com.ydtech.modules.esm.model.vo.EsmUserInternalVo;
 import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/ydtech/modules/admin/controller/SysDeptController.java

@@ -22,20 +22,20 @@ public class SysDeptController {
     private SysDeptService sysDeptService;
 
 
-//    @PreAuthorize("hasAuthority('sys:dept:add')")
+    //    @PreAuthorize("hasAuthority('sys:dept:add')")
     @PostMapping(value = "/add")
     public HttpResult add(@RequestBody SysDept record) {
         return HttpResult.ok(sysDeptService.save(record));
 //        return HttpResult.ok(sysDeptService.add(record));
     }
 
-//    @PreAuthorize("hasAuthority('sys:dept:edit')")
+    //    @PreAuthorize("hasAuthority('sys:dept:edit')")
     @PostMapping(value = "/edit")
     public HttpResult edit(@RequestBody SysDept record) {
         return HttpResult.ok(sysDeptService.updateById(record));
     }
 
-//    @PreAuthorize("hasAuthority('sys:dept:delete')")
+    //    @PreAuthorize("hasAuthority('sys:dept:delete')")
     @PostMapping(value = "/delete")
     public HttpResult delete(@RequestBody List<SysDept> records) {
         System.out.println("" + records);
@@ -57,13 +57,15 @@ public class SysDeptController {
         }
         return HttpResult.ok(sysDeptService.selectListTreeSysDeptVO(deptCode));
     }
-//
+
+    //
 ////    @PreAuthorize("hasAuthority('sys:dept:view')")
     @PostMapping(value = "/findSubDept")
     public HttpResult findSubDept(@RequestBody PageRequest pageRequest) {
         return HttpResult.ok(sysDeptService.findSubDepts(pageRequest));
     }
-//
+
+    //
 ////    @PreAuthorize("hasAuthority('sys:dept:view')")
     @GetMapping(value = "/findMaxDeptId")
     public HttpResult findMaxDeptId(String deptId) {
@@ -72,7 +74,8 @@ public class SysDeptController {
         maxDeptId = sysDeptService.findMaxDeptId(deptId);
         return HttpResult.ok(maxDeptId);
     }
-//
+
+    //
 ////    @PreAuthorize("hasAuthority('sys:dept:view')")
     @GetMapping(value = "/findMaxHouseId")
     public HttpResult findMaxHouseId(String deptId) {
@@ -81,7 +84,8 @@ public class SysDeptController {
         maxDeptId = sysDeptService.findMaxHouseId(deptId);
         return HttpResult.ok(maxDeptId);
     }
-//
+
+    //
 //    //    @PreAuthorize("hasAuthority('sys:dept:view')")
     @GetMapping(value = "/getDeptById")
     public HttpResult getDeptById(String id) {

src/main/java/com/ydtech/modules/admin/controller/SysDictController.java

@@ -68,7 +68,7 @@ public class SysDictController extends BaseController {
 //		return HttpResult.ok(sysDictService.save(record));
 //	}
 
-//    @PreAuthorize("hasAuthority('sys:dict:add')")
+    //    @PreAuthorize("hasAuthority('sys:dict:add')")
     @PostMapping(value = "/add")
     public HttpResult add(@RequestBody SysDict record) {
 //		return HttpResult.ok(sysDictService.save(record));
@@ -77,7 +77,7 @@ public class SysDictController extends BaseController {
         return HttpResult.ok(result);
     }
 
-//    @PreAuthorize("hasAuthority('sys:dict:edit')")
+    //    @PreAuthorize("hasAuthority('sys:dict:edit')")
     @PostMapping(value = "/edit")
     public HttpResult edit(@RequestBody SysDict record) {
 //		return HttpResult.ok(sysDictService.save(record));
@@ -86,26 +86,26 @@ public class SysDictController extends BaseController {
         return HttpResult.ok(result);
     }
 
-//    @PreAuthorize("hasAuthority('sys:dict:add') AND hasAuthority('sys:dict:edit')")
+    //    @PreAuthorize("hasAuthority('sys:dict:add') AND hasAuthority('sys:dict:edit')")
     @PostMapping(value = "/savetype")
     public HttpResult savetype(@RequestBody SysDictType record) {
         return HttpResult.ok(sysDictTypeService.insertSelective(record));
     }
 
 
-//    @PreAuthorize("hasAuthority('sys:dict:delete')")
+    //    @PreAuthorize("hasAuthority('sys:dict:delete')")
     @PostMapping(value = "/delete")
     public HttpResult delete(@RequestBody List<SysDict> records) {
         return HttpResult.ok(sysDictService.delete(records));
     }
 
-//    @PreAuthorize("hasAuthority('sys:dict:view')")
+    //    @PreAuthorize("hasAuthority('sys:dict:view')")
     @PostMapping(value = "/findPage")
     public HttpResult findPage(@RequestBody PageRequest pageRequest) {
         return HttpResult.ok(sysDictService.findPage(pageRequest));
     }
 
-//    //	@PreAuthorize("hasAuthority('sys:dict:view')")
+    //    //	@PreAuthorize("hasAuthority('sys:dict:view')")
     @GetMapping(value = "/findByLable")
     public HttpResult findByLable(@RequestParam String lable, HttpServletRequest request) {
         List<SysDict> byLable = sysDictService.findByLable(lable);
@@ -276,7 +276,7 @@ public class SysDictController extends BaseController {
 
 
     /**
-     *  枚举类字典
+     * 枚举类字典
      *
      * @author: lig
      * @date: 2023年04月10日 0010
@@ -302,8 +302,8 @@ public class SysDictController extends BaseController {
 
 
     /**
-     *
      * 枚举类
+     *
      * @author: lig
      * @date: 2023年04月10日 0010
      */
@@ -315,7 +315,7 @@ public class SysDictController extends BaseController {
         if (StringUtils.isNotEmpty(type)) {
             List<DictionaryManagement> result = new ArrayList<>();
             dictList.stream().forEach(a -> {
-                if(a.getDictType().equals(type)){
+                if (a.getDictType().equals(type)) {
                     result.add(a);
                 }
             });

src/main/java/com/ydtech/modules/admin/controller/SysMenuController.java

@@ -51,7 +51,7 @@ public class SysMenuController {
         return HttpResult.ok(sysMenuService.findTree(userName, 1));
     }
 
-//    @PreAuthorize("hasAuthority('sys:menu:view')")
+    //    @PreAuthorize("hasAuthority('sys:menu:view')")
     @GetMapping(value = "/findMenuTree")
     public HttpResult findMenuTree() {
         return HttpResult.ok(sysMenuService.findTree(null, 0));

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -432,7 +432,6 @@ public class SysUserController extends BaseController {
     }
 
 
-
     /**
      * 审批
      *
@@ -446,11 +445,11 @@ public class SysUserController extends BaseController {
             , @ApiImplicitParam(name = "status", value = "审批状态")
     })
     @GetMapping(value = "/approval")
-    public HttpResult approval(@RequestParam String userId,@RequestParam String status) {
+    public HttpResult approval(@RequestParam String userId, @RequestParam String status) {
 
         LambdaUpdateWrapper<SysUser> luw = new LambdaUpdateWrapper();
-        luw.eq(SysUser::getId,userId);
-        luw.set(SysUser::getApprovalStatus,status);
+        luw.eq(SysUser::getId, userId);
+        luw.set(SysUser::getApprovalStatus, status);
 
         return HttpResult.ok(sysUserService.update(luw));
 

src/main/java/com/ydtech/modules/admin/dao/SysRoleMenuMapper.java

@@ -15,7 +15,6 @@ public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
     String SysMenuSqlT1 = SysMenuSql + sysRoleMenuIdSql;
 
 
-
     /**
      * 获取菜单id集
      */

src/main/java/com/ydtech/modules/admin/dao/SysUserMapper.java

@@ -108,7 +108,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
 
     //    @Select("select count(1) " + selectUserFromSql + selectUserFromWhereSql)
-    @Select({"<script>","select count(1) ",selectUserFromSql,selectUserFromWhereSql,"</script>"})
+    @Select({"<script>", "select count(1) ", selectUserFromSql, selectUserFromWhereSql, "</script>"})
     int gainUserBaseInfoCount(@Param("page") PageRequest pageRequest);
 
 }

src/main/java/com/ydtech/modules/admin/model/SysMenu.java

@@ -47,8 +47,6 @@ public class SysMenu implements Serializable {
     private List<SysMenu> children;
 
 
-
-
 }
 
 

src/main/java/com/ydtech/modules/admin/model/SysMethodLog.java

@@ -11,7 +11,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
 
-@TableName(value ="sys_method_log")
+@TableName(value = "sys_method_log")
 @Data
 public class SysMethodLog implements Serializable {
 

src/main/java/com/ydtech/modules/admin/service/SysDeptService.java

@@ -2,18 +2,15 @@ package com.ydtech.modules.admin.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.modules.admin.dao.SysDeptDao;
 import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.vo.TreeSysDeptVO;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
-import com.ydtech.modules.esm.model.EsmInsCompany;
-import com.ydtech.modules.esm.vo.req.EsmInsCompanyReq;
 
 import java.util.List;
 
 public interface SysDeptService extends IService<SysDept> {
-//public interface SysDeptService extends SysDeptDao {
+    //public interface SysDeptService extends SysDeptDao {
 //    /**
 //     * 查询机构树
 //     *
@@ -24,23 +21,26 @@ public interface SysDeptService extends IService<SysDept> {
 //
     //查找自已有权限的部门树
     public List<TreeSysDeptVO> selectListTreeSysDeptVO(String deptCode);
-//
+
+    //
     public PageResult findSubDepts(PageRequest pageRequest);
-//
+
+    //
 //    public int add(SysDept record);
 //
 //    public int edit(SysDept record);
 //
     public String findMaxDeptId(String deptId);
-//
+
+    //
     public String findMaxHouseId(String deptId);
-//
+
+    //
 //    public SysDept selectByPk(String id);
 //
     List<TreeSysDeptVO> selectListWhere(String where, Object[] paramValues);
 
 
-
     List<SysDept> findTree(SysDept sysDept);
 }
 

src/main/java/com/ydtech/modules/admin/service/SysUserService.java

@@ -54,7 +54,7 @@ public interface SysUserService extends IService<SysUser> {
 
 
     /**
-     *  获取添加用户ID
+     * 获取添加用户ID
      *
      * @author: lig
      * @date: 2023年05月11日 0011

src/main/java/com/ydtech/modules/admin/service/impl/SysDeptServiceImpl.java

@@ -35,7 +35,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
     @Override
     public List<SysDept> findTree(SysDept sysDept) {
         LambdaQueryWrapper<SysDept> lqw = new LambdaQueryWrapper();
-        lqw.eq(SysDept::getDelFlag,0);
+        lqw.eq(SysDept::getDelFlag, 0);
         if (null != sysDept) {
             lqw.like(StringUtils.isNotEmpty(sysDept.getName()), SysDept::getName, sysDept.getName());
 //            lqw.like(StringUtils.isNotEmpty(req.getParentId()), EsmInsCompany::getParentId, req.getParentId());
@@ -61,7 +61,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
 //        implements SysDeptService {
 
 
-//    @Override
+    //    @Override
 //    public int add(SysDept record) {
 //        return insertSelective(record);
 //    }
@@ -78,16 +78,17 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
 
         Page p = PageRequest.buildPageRequest(pageRequest);
         LambdaQueryWrapper<SysDept> lqw = new LambdaQueryWrapper();
-        lqw.eq(StringUtils.isNotEmpty(id),SysDept::getParentId,id);
+        lqw.eq(StringUtils.isNotEmpty(id), SysDept::getParentId, id);
 
-        IPage<SysDept> pResult = page(p,lqw);
+        IPage<SysDept> pResult = page(p, lqw);
 
         //传入查询条件
         PageResult pageResult = PageResult.buildPageResult(pResult);
         return pageResult;
 
     }
-//
+
+    //
 //
 //    public SysDept findById(Long id) {
 //        return selectByPk("" + id);
@@ -133,11 +134,11 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
     public List<TreeSysDeptVO> selectListTreeSysDeptVO(String id) {
         if (id == null) id = "";
         LambdaQueryWrapper<SysDept> lqw = new LambdaQueryWrapper<>();
-        lqw.like(StringUtils.isNotEmpty(id),SysDept::getId,id);
+        lqw.like(StringUtils.isNotEmpty(id), SysDept::getId, id);
         List<SysDept> deptList = list(lqw);
         List<TreeSysDeptVO> recordList = new ArrayList<TreeSysDeptVO>();
 
-        deptList.stream().forEach(a ->{
+        deptList.stream().forEach(a -> {
             TreeSysDeptVO model = new TreeSysDeptVO();
             model.setId(a.getId());
             model.setName(a.getName());
@@ -181,7 +182,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
 //        return recordList;
 //    }
 
-//    public String findMaxDeptId(String deptId) {
+    //    public String findMaxDeptId(String deptId) {
 //        if (deptId == null) return "";
 //        String result = "00";
 //
@@ -202,10 +203,10 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
 
 
         QueryWrapper<SysDept> qw = new QueryWrapper<>();
-        qw.like(StringUtils.isNotEmpty(deptId),"id",deptId + "D%");
+        qw.like(StringUtils.isNotEmpty(deptId), "id", deptId + "D%");
 
         qw.select("IFNULL(MAX(id),0) maxid");
-        Map<String,Object> m = getMap(qw);
+        Map<String, Object> m = getMap(qw);
         String maxId = m.get("maxid").toString();
         if (!maxId.equalsIgnoreCase("0") && !maxId.equalsIgnoreCase(deptId)) {
             result = maxId.substring(deptId.length() + 1);
@@ -221,10 +222,10 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
 
 
         QueryWrapper<SysDept> qw = new QueryWrapper<>();
-        qw.like(StringUtils.isNotEmpty(deptId),"id",deptId + "M%");
+        qw.like(StringUtils.isNotEmpty(deptId), "id", deptId + "M%");
 
         qw.select("IFNULL(MAX(id),0) maxid");
-        Map<String,Object> m = getMap(qw);
+        Map<String, Object> m = getMap(qw);
         String maxId = m.get("maxid").toString();
         if (!maxId.equalsIgnoreCase("0") && !maxId.equalsIgnoreCase(deptId)) {
             result = maxId.substring(deptId.length() + 1);
@@ -247,7 +248,8 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
 //
 //        return result;
     }
-//
+
+    //
     @Override
     public List<TreeSysDeptVO> selectListWhere(String where, Object[] paramValues) {
 
@@ -258,7 +260,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
 
         List<TreeSysDeptVO> recordList = new ArrayList<TreeSysDeptVO>();
 
-        sysDeptList.stream().forEach(a ->{
+        sysDeptList.stream().forEach(a -> {
             TreeSysDeptVO model = new TreeSysDeptVO();
             model.setId(a.getId());
             model.setName(a.getName());
@@ -275,7 +277,6 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
     }
 
 
-
     private boolean exists(List<SysDept> insSysDeptList, SysDept insSysDept) {
         AtomicBoolean exist = new AtomicBoolean(false);
         insSysDeptList.stream().forEach(a -> {

src/main/java/com/ydtech/modules/admin/service/impl/SysRoleServiceImpl.java

@@ -31,7 +31,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole>
     @Override
     public SysRole findByName(String name) {
         LambdaQueryWrapper<SysRole> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(SysRole::getName,name);
+        lqw.eq(SysRole::getName, name);
         List<SysRole> sysRoles = list(lqw);
 //        List<SysRole> sysRoles = selectList(" where name=?", new Object[]{name.trim()});
         if (sysRoles != null && sysRoles.size() > 0) {
@@ -48,8 +48,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole>
 
         Page p = PageRequest.buildPageRequest(pageRequest);
         LambdaQueryWrapper<SysRole> lqw = new LambdaQueryWrapper<>();
-        lqw.like(StringUtils.isNotEmpty(name),SysRole::getName,name);
-        IPage<SysRole> pageList = page(p,lqw);
+        lqw.like(StringUtils.isNotEmpty(name), SysRole::getName, name);
+        IPage<SysRole> pageList = page(p, lqw);
         return PageResult.buildPageResult(pageList);
 
 

src/main/java/com/ydtech/modules/admin/service/impl/SysUserRoleServiceImpl.java

@@ -17,7 +17,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
     @Override
     public SysUserRole selectByUserId(String userId) {
         LambdaQueryWrapper<SysUserRole> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(SysUserRole::getUserId,userId);
+        lqw.eq(SysUserRole::getUserId, userId);
         return getOne(lqw);
     }
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -62,7 +62,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         SysUser sysUser = null;
 
         LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(StringUtils.isNotEmpty(phone),SysUser::getMobile,phone);
+        lqw.eq(StringUtils.isNotEmpty(phone), SysUser::getMobile, phone);
         List<SysUser> lst = list(lqw);
         if (lst.size() > 0) {
             sysUser = lst.get(0);
@@ -93,7 +93,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
 
             List<SysMenu> sysMenuList = sysRoleMenuService.gainMenuIds(sysUser.getId());
 
-            lsPerms = sysMenuList.stream().filter(a ->StringUtils.isNotEmpty(a.getPerms())).map(SysMenu::getPerms).collect(Collectors.toList());
+            lsPerms = sysMenuList.stream().filter(a -> StringUtils.isNotEmpty(a.getPerms())).map(SysMenu::getPerms).collect(Collectors.toList());
 
         }
 
@@ -161,9 +161,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         List<String> ids = lsSysUser.stream().map(SysUser::getId).collect(Collectors.toList());
 
         LambdaUpdateWrapper<SysUser> lqw = new LambdaUpdateWrapper<>();
-        lqw.set(SysUser::getDelFlag,"-1");
-        lqw.in(SysUser::getId,ids);
-        return update(lqw)==true?ids.size():0;
+        lqw.set(SysUser::getDelFlag, "-1");
+        lqw.in(SysUser::getId, ids);
+        return update(lqw) == true ? ids.size() : 0;
 
 
     }
@@ -205,12 +205,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
 
 
         //计算mysql分页起索引
-        int firstIndex = pageRequest.getPageNum()==1?0:(pageRequest.getPageNum()-1) * pageRequest.getPageSize() +1;
+        int firstIndex = pageRequest.getPageNum() == 1 ? 0 : (pageRequest.getPageNum() - 1) * pageRequest.getPageSize() + 1;
         //请求替换分页开始索引
         pageRequest.setPageNum(firstIndex);
 
         //计算mysql分页总页数
-        int totalPages = total % pageRequest.getPageSize() == 0?total / pageRequest.getPageSize():total / pageRequest.getPageSize() +1;
+        int totalPages = total % pageRequest.getPageSize() == 0 ? total / pageRequest.getPageSize() : total / pageRequest.getPageSize() + 1;
 
 //        if(pageRequest.getPageNum() > 0){
 //            int newPageNum = pageRequest.getPageNum() -1;
@@ -234,13 +234,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         String nextPK;
         QueryWrapper<SysUser> lq = new QueryWrapper<>();
         lq.select(" MAX(id) as id ");
-        lq.eq("dept_id",deptId);
+        lq.eq("dept_id", deptId);
 
         SysUser userMaxId = getOne(lq);
 
 
         String maxId = "";
-        if(null != userMaxId) maxId = userMaxId.getId();
+        if (null != userMaxId) maxId = userMaxId.getId();
 
         if (StringUtils.isNullOrEmpty(maxId)) {
             nextPK = deptId + "001";
@@ -260,8 +260,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
 //        EsmUserInternal sysUserInternal = esmUserInternalService.selectByPk(userId);
 
         String pDeptId = sysUser.getDeptId();
-        if(pDeptId.indexOf("D") > 1){
-            pDeptId = sysUser.getDeptId().substring(0,pDeptId.indexOf("D"));
+        if (pDeptId.indexOf("D") > 1) {
+            pDeptId = sysUser.getDeptId().substring(0, pDeptId.indexOf("D"));
         }
         SysDept sysDept = sysDeptService.getById(pDeptId);
 

src/main/java/com/ydtech/modules/admin/vo/SysUserInternalVO.java

@@ -28,6 +28,4 @@ public class SysUserInternalVO {
     private SysDept sysDept;
 
 
-
-
 }

src/main/java/com/ydtech/modules/esm/controller/EsmInsAttributionController.java

@@ -1,64 +1,46 @@
 package com.ydtech.modules.esm.controller;
 
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ydtech.constants.RedisConstant;
 import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
-import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.esm.model.*;
 import com.ydtech.modules.esm.service.*;
-import com.ydtech.modules.esm.vo.EsmInsAttributionTemplateVo;
-import com.ydtech.modules.esm.vo.EsmInsAttributionVo;
-import com.ydtech.modules.esm.vo.req.EsmInsAttributionAuthorizeReq;
+import com.ydtech.modules.esm.model.vo.EsmInsAttributionVo;
+import com.ydtech.modules.esm.model.vo.req.EsmInsAttributionAuthorizeReq;
 import com.ydtech.modules.order.entity.vo.zm.ZmAscriptionResponse;
 import com.ydtech.modules.order.entity.vo.zm.ZmAscriptionVo;
 import com.ydtech.modules.order.service.ZhongMeiOrderService;
-import com.ydtech.security.JwtUserDetails;
-import com.ydtech.security.utils.SecurityUtils;
-import com.ydtech.utils.JsonUtils;
-import com.ydtech.utils.RedisUtils;
 import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.sql.SQLException;
-import java.sql.SQLIntegrityConstraintViolationException;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @Api(tags = "归属信息")
 @RestController
-@RequestMapping("esm/attribution")
+@RequestMapping("/esm/attribution")
 public class EsmInsAttributionController extends BaseController {
 
     @Autowired
     EsmInsAttributionService esmInsAttributionService;
+
     @Autowired
     EsmInsAttributionDeptService esmInsAttributionDeptService;
+
     @Autowired
     EsmInsAttributionTemplateService esmInsAttributionTemplateService;
 
@@ -81,7 +63,7 @@ public class EsmInsAttributionController extends BaseController {
         queryWrapper.eq(EsmInsAttributionTemplate::getInsCompanyId, insCompanyId);
         EsmInsAttributionTemplate template = esmInsAttributionTemplateService.getOne(queryWrapper);
 
-        if (null == template) return HttpResult.ok("模板不存在，请联系管理员初始化模板");
+//        if (null == template) return HttpResult.ok("模板不存在，请联系管理员初始化模板");
 
         return HttpResult.ok(template);
 
@@ -93,28 +75,22 @@ public class EsmInsAttributionController extends BaseController {
 //    public HttpResult gainAllowQuoteList() {
 //
 //        String str = RedisUtils.get(RedisConstant.INS_COMPANY_ALLOW_QUOTE);
-//        if(StringUtils.isNotEmpty(str)){
+//        if (StringUtils.isNotEmpty(str)) {
 //            LambdaQueryWrapper<EsmInsAttribution> lqw = new LambdaQueryWrapper();
-//            lqw.eq(EsmInsAttribution::getOpenQuote,1);
+//            lqw.eq(EsmInsAttribution::getOpenQuote, 1);
 //            List<EsmInsAttribution> openQuoteList = esmInsAttributionService.list(lqw);
-//            RedisUtils.set(RedisConstant.INS_COMPANY_ALLOW_QUOTE , JsonUtils.toJson(openQuoteList));
+//            RedisUtils.set(RedisConstant.INS_COMPANY_ALLOW_QUOTE, JsonUtils.toJson(openQuoteList));
 //        }
-//
-//        List<EsmInsAttribution> attrList = JsonUtils.toObjectList(str,EsmInsAttribution.class);
-//
-//
-//
+//        List<EsmInsAttribution> attrList = JsonUtils.toObjectList(str, EsmInsAttribution.class);
 //
 ////        LambdaQueryWrapper<EsmInsAttribution> queryWrapper = new LambdaQueryWrapper<>();
 ////        queryWrapper.eq(EsmInsAttribution::getOpenQuote, "1");
 ////        List<EsmInsAttribution> attrList = esmInsAttributionService.list(queryWrapper);
 //
 //        return HttpResult.ok(attrList);
-//
 //    }
 
 
-
     /**
      * @author: lig
      * @date: 2022年10月26日 0026
@@ -124,7 +100,8 @@ public class EsmInsAttributionController extends BaseController {
     @Transactional
     public HttpResult save(@RequestBody EsmInsAttribution eia, HttpServletRequest request) {
 
-        long i = esmInsAttributionService.count(new LambdaQueryWrapper<EsmInsAttribution>().eq(EsmInsAttribution::getUsername, eia.getUsername()));
+        long i = esmInsAttributionService.count(new LambdaQueryWrapper<EsmInsAttribution>()
+                .eq(EsmInsAttribution::getUsername, eia.getUsername()));
         if (StringUtils.isEmpty(eia.getId()) && i > 0) return HttpResult.ok("保险公司账号不可重复！");
         if (StringUtils.isNotEmpty(eia.getId()) && i > 1) return HttpResult.ok("保险公司账号不可重复！");
 
@@ -135,17 +112,15 @@ public class EsmInsAttributionController extends BaseController {
         String aValue = "{}";
 
         //中煤
-        if(StringUtils.isNotEmpty(eia.getInsCompanyId()) && eia.getInsCompanyId().equals("000019")){
+        if (StringUtils.isNotEmpty(eia.getInsCompanyId()) && eia.getInsCompanyId().equals("000019")) {
             ZmAscriptionVo zmVo = EsmInsAttribution.gainZmAscriptionVo(eia);
             ZmAscriptionResponse zmResponse = zhongMeiOrderService.ascription(zmVo);
-            if(null == zmResponse)return HttpResult.ok("归属保存失败，请检查参数是否正确！");
+            if (null == zmResponse) return HttpResult.ok("归属保存失败，请检查参数是否正确！");
             aValue = JSONObject.toJSONString(zmResponse);
-        }else{
-            return HttpResult.ok("未开通配置此保险公司保险代理信息！");
         }
 
         eia.setValue(aValue);
-        if(StringUtils.isNullOrEmpty(eia.getInsCompanyName())){
+        if (StringUtils.isNullOrEmpty(eia.getInsCompanyName())) {
             //保险公司
             EsmInsCompany insCompany = esmInsCompanyService.getById(eia.getInsCompanyId());
             eia.setInsCompanyName(insCompany.getName());
@@ -167,7 +142,7 @@ public class EsmInsAttributionController extends BaseController {
 
     @ApiOperation(value = "获取用户归属 分页")
     @GetMapping(value = "/findPage")
-    public HttpResult findPage(PageRequest pageRequest,HttpServletRequest request) {
+    public HttpResult findPage(PageRequest pageRequest, HttpServletRequest request) {
 
         String userId = getUserId(request);
 //        int pageNum = pageRequest.getPageNum();
@@ -175,11 +150,11 @@ public class EsmInsAttributionController extends BaseController {
         String insCompanyId = pageRequest.getColumnFilterValue(pageRequest, "ins_company_id"); // 保险公司ID
 
         LambdaQueryWrapper<EsmInsAttribution> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(StringUtils.isNotEmpty(insCompanyId),EsmInsAttribution::getInsCompanyId, insCompanyId);
-        lqw.eq(EsmInsAttribution::getUserId,userId);
+        lqw.eq(StringUtils.isNotEmpty(insCompanyId), EsmInsAttribution::getInsCompanyId, insCompanyId);
+        lqw.eq(EsmInsAttribution::getUserId, userId);
         Page p = PageRequest.buildPageRequest(pageRequest);
 
-        IPage<EsmInsAttribution> pResult = esmInsAttributionService.page(p,lqw);
+        IPage<EsmInsAttribution> pResult = esmInsAttributionService.page(p, lqw);
 
         return HttpResult.ok(PageResult.buildPageResult(pResult));
 
@@ -207,19 +182,20 @@ public class EsmInsAttributionController extends BaseController {
         return HttpResult.ok(esmInsAttributionService.removeById(id));
 
     }
+
     @ApiOperation(value = "归属授权")
     @PostMapping(value = "/authorize")
 //    @ApiImplicitParam(name = "deptIds", value = "部门ID集", required = true, paramType = "query", dataType = "String")
     public HttpResult authorize(@RequestBody EsmInsAttributionAuthorizeReq req) {
 
-        LambdaUpdateWrapper<EsmInsAttributionDept> luw = new LambdaUpdateWrapper();
-        luw.eq(EsmInsAttributionDept::getAttributionId,req.getAttributionId());
+        LambdaUpdateWrapper<EsmInsAttributionDept> luw = new LambdaUpdateWrapper<>();
+        luw.eq(EsmInsAttributionDept::getAttributionId, req.getAttributionId());
         esmInsAttributionDeptService.remove(luw);
 
 
-        if(null != req.getDeptIds() && req.getDeptIds().size() > 0){
+        if (null != req.getDeptIds() && !req.getDeptIds().isEmpty()) {
             List<EsmInsAttributionDept> eiadList = new ArrayList<>();
-            req.getDeptIds().stream().forEach(a ->{
+            req.getDeptIds().stream().forEach(a -> {
                 EsmInsAttributionDept eiad = new EsmInsAttributionDept();
                 eiad.setAttributionId(Long.valueOf(req.getAttributionId()));
                 eiad.setInsCompanyId(req.getInsCompanyId());

src/main/java/com/ydtech/modules/esm/controller/EsmInsAttributionTemplateController.java

@@ -0,0 +1,58 @@
+package com.ydtech.modules.esm.controller;
+
+import com.ydtech.core.page.BasePageVO;
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.esm.model.vo.EsmInsAttributionTemplateSaveVo;
+import com.ydtech.modules.esm.service.EsmInsAttributionTemplateService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wenks
+ * @version 0.0.2
+ * @description 归属信息模板管理
+ * @date 2023/5/29 10:16
+ */
+@Api(tags = "归属信息模板管理")
+@RestController
+@RequestMapping("/esm/attributionTemplate")
+public class EsmInsAttributionTemplateController {
+
+    private final EsmInsAttributionTemplateService esmInsAttributionTemplateService;
+
+    public EsmInsAttributionTemplateController(EsmInsAttributionTemplateService esmInsAttributionTemplateService) {
+        this.esmInsAttributionTemplateService = esmInsAttributionTemplateService;
+    }
+
+    @PostMapping
+    @ApiOperation("提交模板信息")
+    public HttpResult submit(@RequestBody EsmInsAttributionTemplateSaveVo esmInsAttributionTemplateSaveVo) {
+        return esmInsAttributionTemplateService.submit(esmInsAttributionTemplateSaveVo);
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation("通过id获取模板信息")
+    public HttpResult getByIdObtain(@PathVariable Long id) {
+        return esmInsAttributionTemplateService.getByIdObtain(id);
+    }
+
+    @GetMapping
+    @ApiOperation("分页获取模板信息")
+    public HttpResult getAll(BasePageVO basePageVO) {
+        return esmInsAttributionTemplateService.getAll(basePageVO);
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation("通过id删除模板信息")
+    public HttpResult deleteById(@PathVariable Long id) {
+        return esmInsAttributionTemplateService.deleteById(id);
+    }
+
+    @PutMapping("/{id}")
+    @ApiOperation("通过id修改模板信息")
+    public HttpResult revise(@PathVariable Long id, EsmInsAttributionTemplateSaveVo esmInsAttributionTemplateSaveVo) {
+        return esmInsAttributionTemplateService.revise(id, esmInsAttributionTemplateSaveVo);
+    }
+
+}

src/main/java/com/ydtech/modules/esm/controller/EsmInsCompanyController.java

@@ -1,35 +1,25 @@
 package com.ydtech.modules.esm.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.ydtech.constants.RedisConstant;
 import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
-import com.ydtech.modules.esm.model.EsmInsAttribution;
 import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.esm.service.EsmInsCompanyService;
-import com.ydtech.modules.esm.vo.req.EsmInsCompanyReq;
-import com.ydtech.utils.JsonUtils;
-import com.ydtech.utils.RedisUtils;
+import com.ydtech.modules.esm.model.vo.req.EsmInsCompanyReq;
 import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.Base64;
 import java.util.List;
-import java.util.Set;
 
 /**
  * ---------------------------
@@ -68,12 +58,12 @@ public class EsmInsCompanyController extends BaseController {
         Integer result = 0;
         String msg = "保存成功";
 
-        if(StringUtils.isNullOrEmpty(record.getId()))return HttpResult.ok("编号必填");
+        if (StringUtils.isNullOrEmpty(record.getId())) return HttpResult.ok("编号必填");
 
         LambdaQueryWrapper<EsmInsCompany> lqw = new LambdaQueryWrapper();
-        lqw.eq(EsmInsCompany::getId,record.getId());
+        lqw.eq(EsmInsCompany::getId, record.getId());
         long i = esmInsCompanyService.count(lqw);
-        if(i > 0) return HttpResult.ok("重复编码");
+        if (i > 0) return HttpResult.ok("重复编码");
         esmInsCompanyService.save(record);
         return HttpResult.ok(msg);
     }
@@ -86,9 +76,9 @@ public class EsmInsCompanyController extends BaseController {
         String msg = "保存成功";
 
         LambdaQueryWrapper<EsmInsCompany> lqw = new LambdaQueryWrapper();
-        lqw.eq(EsmInsCompany::getId,record.getId());
+        lqw.eq(EsmInsCompany::getId, record.getId());
         long i = esmInsCompanyService.count(lqw);
-        if(i > 1) return HttpResult.ok("重复编码");
+        if (i > 1) return HttpResult.ok("重复编码");
 
         esmInsCompanyService.updateById(record);
         return HttpResult.ok(msg);
@@ -105,7 +95,7 @@ public class EsmInsCompanyController extends BaseController {
     public HttpResult selectList(@RequestParam String parentid) {
         if (StringUtils.isNullOrEmpty(parentid)) parentid = "0";
         LambdaQueryWrapper<EsmInsCompany> lqw = new LambdaQueryWrapper();
-        lqw.eq(EsmInsCompany::getParentId,parentid);
+        lqw.eq(EsmInsCompany::getParentId, parentid);
         List<EsmInsCompany> selectList = esmInsCompanyService.list(lqw);
 //        List<EsmInsCompany> selectList = esmInsCompanyService.selectList(" where parent_id = ? ", new Object[]{parentid});
         return HttpResult.ok(selectList);
@@ -139,12 +129,12 @@ public class EsmInsCompanyController extends BaseController {
 
         Page p = PageRequest.buildPageRequest(pageRequest);
         LambdaQueryWrapper<EsmInsCompany> lqw = new LambdaQueryWrapper();
-        lqw.eq(StringUtils.isNotEmpty(id),EsmInsCompany::getId,id);
-        lqw.like(StringUtils.isNotEmpty(name),EsmInsCompany::getName,name);
-        lqw.eq(StringUtils.isNotEmpty(parentId),EsmInsCompany::getParentId,parentId);
-        lqw.eq(EsmInsCompany::getDelFlag,0);
+        lqw.eq(StringUtils.isNotEmpty(id), EsmInsCompany::getId, id);
+        lqw.like(StringUtils.isNotEmpty(name), EsmInsCompany::getName, name);
+        lqw.eq(StringUtils.isNotEmpty(parentId), EsmInsCompany::getParentId, parentId);
+        lqw.eq(EsmInsCompany::getDelFlag, 0);
 
-        IPage<EsmInsCompany> pResult = esmInsCompanyService.page(p,lqw);
+        IPage<EsmInsCompany> pResult = esmInsCompanyService.page(p, lqw);
 
         //传入查询条件
         PageResult pageResult = PageResult.buildPageResult(pResult);
@@ -178,19 +168,18 @@ public class EsmInsCompanyController extends BaseController {
 //    }
 
 
-
     /**
-     *  批量逻辑删除
+     * 批量逻辑删除
      *
      * @author: lig
      * @date: 2023年04月14日 0014
      */
     @ApiOperation(value = "批量删除操作")
-    @DeleteMapping(value ="/idBatch")
+    @DeleteMapping(value = "/idBatch")
     public HttpResult deleteBatch(@RequestParam List<String> idList) {
         LambdaUpdateWrapper<EsmInsCompany> lqw = new LambdaUpdateWrapper<>();
-        lqw.in(EsmInsCompany::getId,idList);
-        lqw.set(EsmInsCompany::getDelFlag,-1);
+        lqw.in(EsmInsCompany::getId, idList);
+        lqw.set(EsmInsCompany::getDelFlag, -1);
         esmInsCompanyService.update(lqw);
 
         return HttpResult.ok("操作成功");
@@ -199,11 +188,11 @@ public class EsmInsCompanyController extends BaseController {
 
 
     @ApiOperation(value = "删除操作")
-    @DeleteMapping(value ="/{id}")
+    @DeleteMapping(value = "/{id}")
     public HttpResult delete(@PathVariable("id") String id) {
 
         EsmInsCompany eic = esmInsCompanyService.getById(id);
-        if(null == eic) return HttpResult.error("对象不存在");
+        if (null == eic) return HttpResult.error("对象不存在");
 
         eic.setDelFlag(-1);
         esmInsCompanyService.updateById(eic);
@@ -213,11 +202,11 @@ public class EsmInsCompanyController extends BaseController {
     }
 
     @ApiOperation(value = "恢复删除操作")
-    @GetMapping(value ="/{id}")
+    @GetMapping(value = "/{id}")
     public HttpResult rollBackDelete(@PathVariable("id") String id) {
 
         EsmInsCompany eic = esmInsCompanyService.getById(id);
-        if(null == eic) return HttpResult.error("对象不存在");
+        if (null == eic) return HttpResult.error("对象不存在");
 
         eic.setDelFlag(0);
         esmInsCompanyService.updateById(eic);
@@ -227,14 +216,13 @@ public class EsmInsCompanyController extends BaseController {
     }
 
 
-
     @ApiOperation(value = "获取允许报价的保险公司列表")
     @GetMapping(value = "/gainAllowQuoteList")
     public HttpResult gainAllowQuoteList() {
         LambdaQueryWrapper<EsmInsCompany> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(EsmInsCompany::getDelFlag,0);
-        lqw.eq(EsmInsCompany::getOpenQuote,1);
-        lqw.eq(EsmInsCompany::getParentId,"0");
+        lqw.eq(EsmInsCompany::getDelFlag, 0);
+        lqw.eq(EsmInsCompany::getOpenQuote, 1);
+        lqw.eq(EsmInsCompany::getParentId, "0");
         List<EsmInsCompany> list = esmInsCompanyService.list(lqw);
         return HttpResult.ok(list);
 

src/main/java/com/ydtech/modules/esm/controller/EsmOfferChannelController.java

@@ -3,10 +3,9 @@ package com.ydtech.modules.esm.controller;
 
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.esm.convert.EsmOfferChannelConvert;
 import com.ydtech.modules.esm.model.EsmOfferChannel;
 import com.ydtech.modules.esm.service.EsmOfferChannelService;
-import com.ydtech.modules.esm.vo.EsmOfferChannelVo;
+import com.ydtech.modules.esm.model.vo.EsmOfferChannelVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;

src/main/java/com/ydtech/modules/esm/controller/EsmPolicyInformationController.java

@@ -17,22 +17,24 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/esm/policy")
 public class EsmPolicyInformationController {
 
-    @Autowired
-    private EsmPolicyInformationService esmPolicyInformationService;
+    private final EsmPolicyInformationService esmPolicyInformationService;
 
-    @Autowired
-    private EsmYaPolicyInformationService esmYaPolicyInformationService;
+    private final EsmYaPolicyInformationService esmYaPolicyInformationService;
 
-    @Autowired
-    private EsmYcPolicyInformationService esmYcPolicyInformationService;
+    private final EsmYcPolicyInformationService esmYcPolicyInformationService;
+
+    public EsmPolicyInformationController(EsmPolicyInformationService esmPolicyInformationService, EsmYaPolicyInformationService esmYaPolicyInformationService, EsmYcPolicyInformationService esmYcPolicyInformationService) {
+        this.esmPolicyInformationService = esmPolicyInformationService;
+        this.esmYaPolicyInformationService = esmYaPolicyInformationService;
+        this.esmYcPolicyInformationService = esmYcPolicyInformationService;
+    }
 
     @PostMapping("/getTotalInsurance")
     @ApiOperation(value = "保险公司合计数据")
-    public HttpResult getTotalInsurance(){
+    public HttpResult getTotalInsurance() {
         return esmPolicyInformationService.getTotalInsurance();
     }
 
-
     @PostMapping("/getCalculationTable")
     @ApiOperation(value = "中煤每日保单费用统计")
     public HttpResult getCalculationTable() {

src/main/java/com/ydtech/modules/esm/controller/EsmSalaryManageController.java

@@ -3,18 +3,19 @@ package com.ydtech.modules.esm.controller;
 import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.esm.model.EsmSalaryCheck;
+import com.ydtech.modules.esm.model.vo.EsmSalaryQueryVO;
+import com.ydtech.modules.esm.model.vo.EsmSocialSecurityQueryVO;
+import com.ydtech.modules.esm.model.vo.EsmSocialSecurityReviewVO;
 import com.ydtech.modules.esm.service.EsmSalaryService;
 import com.ydtech.modules.esm.service.EsmSocialSecurityService;
-import com.ydtech.modules.esm.vo.*;
-import com.ydtech.modules.esm.vo.req.ReqVo;
-import com.ydtech.modules.esm.vo.req.SubmitAuditReq;
+import com.ydtech.modules.esm.model.vo.req.ReqVo;
+import com.ydtech.modules.esm.model.vo.req.SubmitAuditReq;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 

src/main/java/com/ydtech/modules/esm/controller/EsmTrainController.java

@@ -7,14 +7,13 @@ import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.esm.model.EsmTrain;
 import com.ydtech.modules.esm.model.EsmTrainQueryReq;
 import com.ydtech.modules.esm.service.TrainService;
-import com.ydtech.modules.esm.vo.req.EsmTrainCountReq;
+import com.ydtech.modules.esm.model.vo.req.EsmTrainCountReq;
 import com.ydtech.security.utils.JwtTokenUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/ydtech/modules/esm/controller/EsmUserInternalCheckController.java

@@ -19,8 +19,8 @@ import com.ydtech.modules.esm.service.EsmUserAgentCheckService;
 //import com.ydtech.modules.esm.service.EsmUserInternalCheckService;
 import com.ydtech.modules.esm.service.EsmUserInternalService;
 import com.ydtech.modules.esm.service.SysUserCheckService;
-import com.ydtech.modules.esm.vo.UserRegistVO;
-import com.ydtech.modules.esm.vo.VoEsmUserInternalCheck;
+import com.ydtech.modules.esm.model.vo.UserRegistVO;
+import com.ydtech.modules.esm.model.vo.VoEsmUserInternalCheck;
 import com.ydtech.security.utils.PasswordUtils;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;

src/main/java/com/ydtech/modules/esm/controller/EsmUserInternalController.java

@@ -13,15 +13,11 @@ import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.esm.model.*;
+import com.ydtech.modules.esm.model.vo.*;
 import com.ydtech.modules.esm.service.*;
-import com.ydtech.modules.esm.vo.*;
 import com.ydtech.modules.ins.model.InsOrder;
 import com.ydtech.modules.ins.service.InsOrderService;
-import com.ydtech.security.utils.PasswordUtils;
 import com.ydtech.utils.StringUtils;
-import com.ydtech.utils.idgen.IdGenerate;
-import io.swagger.annotations.ApiOperation;
-import org.apache.poi.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -59,6 +55,7 @@ public class EsmUserInternalController extends BaseController {
 
     @Autowired
     private EsmUserAgentCheckService esmUserAgentCheckService;
+
     @Autowired
     InsOrderService insOrderService;
 
@@ -119,7 +116,7 @@ public class EsmUserInternalController extends BaseController {
         }
 
         //EsmUserInternal esmUserInternal = esmUserInternalService.selectByPk(record.getId());
-        records.stream().forEach(a ->{
+        records.stream().forEach(a -> {
             sysUserService.removeById(a);
         });
 //            sysUserService.delete(records);
@@ -237,7 +234,7 @@ public class EsmUserInternalController extends BaseController {
     @PostMapping("/queryRecommender")
     public HttpResult queryRecommender(@RequestParam String comcode) {
         LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(StringUtils.isNotEmpty(comcode),SysUser::getDeptId,comcode);
+        lqw.eq(StringUtils.isNotEmpty(comcode), SysUser::getDeptId, comcode);
         List<SysUser> list = sysUserService.list(lqw);
 
 //        List<SysUser> list = sysUserService.selectList(whereStr.toString(), params.toArray());
@@ -471,9 +468,9 @@ public class EsmUserInternalController extends BaseController {
 
         }
         LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(StringUtils.isNotEmpty(record.getId()),SysUser::getId,record.getId());
-        lqw.eq(StringUtils.isNotEmpty(record.getName()),SysUser::getName,record.getName());
-        lqw.eq(StringUtils.isNotEmpty(record.getMobile()),SysUser::getMobile,record.getMobile());
+        lqw.eq(StringUtils.isNotEmpty(record.getId()), SysUser::getId, record.getId());
+        lqw.eq(StringUtils.isNotEmpty(record.getName()), SysUser::getName, record.getName());
+        lqw.eq(StringUtils.isNotEmpty(record.getMobile()), SysUser::getMobile, record.getMobile());
 
         List<SysUser> users = sysUserService.list(lqw);
 //        List<SysUser> users = sysUserService.selectList(sbStr.toString(), paramList.toArray());

src/main/java/com/ydtech/modules/esm/convert/EsmOfferChannelConvert.java

@@ -1,7 +1,7 @@
 package com.ydtech.modules.esm.convert;
 
 import com.ydtech.modules.esm.model.EsmOfferChannel;
-import com.ydtech.modules.esm.vo.EsmOfferChannelVo;
+import com.ydtech.modules.esm.model.vo.EsmOfferChannelVo;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

src/main/java/com/ydtech/modules/esm/convert/EsmUserInternalCheckConvert.java

@@ -1,7 +1,7 @@
 package com.ydtech.modules.esm.convert;
 
 import com.ydtech.modules.esm.model.EsmUserInternalCheck;
-import com.ydtech.modules.esm.vo.EsmUserInternalVo;
+import com.ydtech.modules.esm.model.vo.EsmUserInternalVo;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

src/main/java/com/ydtech/modules/esm/convert/EsmUserInternalConvert.java

@@ -1,7 +1,7 @@
 package com.ydtech.modules.esm.convert;
 
 import com.ydtech.modules.esm.model.EsmUserInternal;
-import com.ydtech.modules.esm.vo.EsmUserInternalVo;
+import com.ydtech.modules.esm.model.vo.EsmUserInternalVo;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

src/main/java/com/ydtech/modules/esm/dao/EsmAgreementMapper.java

@@ -4,11 +4,11 @@ import com.ydtech.modules.esm.model.EsmAgreement;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
-* @author Administrator
-* @description 针对表【esm_agreement(协议信息表)】的数据库操作Mapper
-* @createDate 2022-09-28 16:13:51
-* @Entity generator.domain.EsmAgreement
-*/
+ * @author Administrator
+ * @description 针对表【esm_agreement(协议信息表)】的数据库操作Mapper
+ * @createDate 2022-09-28 16:13:51
+ * @Entity generator.domain.EsmAgreement
+ */
 public interface EsmAgreementMapper extends BaseMapper<EsmAgreement> {
 
 }

src/main/java/com/ydtech/modules/esm/dao/EsmInsAttributionDeptMapper.java

@@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ydtech.modules.esm.model.EsmInsAttributionDept;
 
 /**
-* @author Administrator
-* @description 针对表【esm_ins_attribution_dept(保险公司归属部门表)】的数据库操作Mapper
-* @createDate 2022-11-16 14:26:43
-* @Entity generator.domain.EsmInsAttributionDept
-*/
+ * @author Administrator
+ * @description 针对表【esm_ins_attribution_dept(保险公司归属部门表)】的数据库操作Mapper
+ * @createDate 2022-11-16 14:26:43
+ * @Entity generator.domain.EsmInsAttributionDept
+ */
 public interface EsmInsAttributionDeptMapper extends BaseMapper<EsmInsAttributionDept> {
 
 }

src/main/java/com/ydtech/modules/esm/dao/EsmInsAttributionMapper.java

@@ -4,11 +4,11 @@ import com.ydtech.modules.esm.model.EsmInsAttribution;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
-* @author Administrator
-* @description 针对表【esm_ins_attribution(归属信息)】的数据库操作Mapper
-* @createDate 2022-11-11 14:22:24
-* @Entity generator.domain.EsmInsAttribution
-*/
+ * @author Administrator
+ * @description 针对表【esm_ins_attribution(归属信息)】的数据库操作Mapper
+ * @createDate 2022-11-11 14:22:24
+ * @Entity generator.domain.EsmInsAttribution
+ */
 public interface EsmInsAttributionMapper extends BaseMapper<EsmInsAttribution> {
 
 }

src/main/java/com/ydtech/modules/esm/dao/EsmInsAttributionTemplateMapper.java

@@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ydtech.modules.esm.model.EsmInsAttributionTemplate;
 
 /**
-* @author Administrator
-* @description 针对表【esm_ins_attribution_template(归属信息模板)】的数据库操作Mapper
-* @createDate 2022-11-11 14:22:24
-* @Entity generator.domain.EsmInsAttributionTemplate
-*/
+ * @author Administrator
+ * @description 针对表【esm_ins_attribution_template(归属信息模板)】的数据库操作Mapper
+ * @createDate 2022-11-11 14:22:24
+ * @Entity generator.domain.EsmInsAttributionTemplate
+ */
 public interface EsmInsAttributionTemplateMapper extends BaseMapper<EsmInsAttributionTemplate> {
 
 }

src/main/java/com/ydtech/modules/esm/dao/EsmOfferChannelMapper.java

@@ -4,11 +4,11 @@ import com.ydtech.modules.esm.model.EsmOfferChannel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
-* @author Administrator
-* @description 针对表【esm_offer_channel(报价渠道（保险公司）)】的数据库操作Mapper
-* @createDate 2022-09-28 14:44:31
-* @Entity generator.domain.EsmOfferChannel
-*/
+ * @author Administrator
+ * @description 针对表【esm_offer_channel(报价渠道（保险公司）)】的数据库操作Mapper
+ * @createDate 2022-09-28 14:44:31
+ * @Entity generator.domain.EsmOfferChannel
+ */
 public interface EsmOfferChannelMapper extends BaseMapper<EsmOfferChannel> {
 
 }

src/main/java/com/ydtech/modules/esm/dao/EsmSalaryCheckMapper.java

@@ -1,8 +1,8 @@
 package com.ydtech.modules.esm.dao;
 
 import com.ydtech.modules.esm.model.EsmSalaryCheck;
-import com.ydtech.modules.esm.vo.EsmSalaryQueryVO;
-import com.ydtech.modules.esm.vo.res.EsmSalaryCheckRes;
+import com.ydtech.modules.esm.model.vo.EsmSalaryQueryVO;
+import com.ydtech.modules.esm.model.vo.res.EsmSalaryCheckRes;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

src/main/java/com/ydtech/modules/esm/dao/EsmSalaryMapper.java

@@ -1,7 +1,7 @@
 package com.ydtech.modules.esm.dao;
 
 import com.ydtech.modules.esm.model.EsmSalary;
-import com.ydtech.modules.esm.vo.res.EsmSalaryRes;
+import com.ydtech.modules.esm.model.vo.res.EsmSalaryRes;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

src/main/java/com/ydtech/modules/esm/dao/EsmSocialSecurityDao.java

@@ -1,8 +1,8 @@
 package com.ydtech.modules.esm.dao;
 
 import com.ydtech.modules.esm.model.EsmSocialSecurity;
-import com.ydtech.modules.esm.vo.EsmSocialSecurityExcelVO;
-import com.ydtech.modules.esm.vo.res.EsmSocialSecurityRes;
+import com.ydtech.modules.esm.model.vo.EsmSocialSecurityExcelVO;
+import com.ydtech.modules.esm.model.vo.res.EsmSocialSecurityRes;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

src/main/java/com/ydtech/modules/esm/dao/EsmTrainCountMapper.java

@@ -3,8 +3,8 @@ package com.ydtech.modules.esm.dao;
 import com.ydtech.modules.esm.model.EsmTrainCount;
 import com.ydtech.modules.esm.model.EsmTrainCountExample;
 import com.ydtech.modules.esm.model.EsmTrainCountKey;
-import com.ydtech.modules.esm.vo.req.EsmTrainCountReq;
-import com.ydtech.modules.esm.vo.res.EsmTrainCountVO;
+import com.ydtech.modules.esm.model.vo.req.EsmTrainCountReq;
+import com.ydtech.modules.esm.model.vo.res.EsmTrainCountVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

src/main/java/com/ydtech/modules/esm/dao/EsmUserAgentMapper.java

@@ -1,10 +1,8 @@
 package com.ydtech.modules.esm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.admin.vo.SysUserVO;
 import com.ydtech.modules.esm.model.EsmUserAgent;
-import com.ydtech.modules.esm.vo.TeamUserVONew;
+import com.ydtech.modules.esm.model.vo.TeamUserVONew;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;

src/main/java/com/ydtech/modules/esm/model/DualidDto.java

@@ -17,7 +17,7 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @ApiModel(value = "文件自增id和文件夹自增id", description = "该类对应表Dualid")
-public class DualidDto{
+public class DualidDto {
 
     @ApiModelProperty(value = "文件夹id")
     private Long dirid;

src/main/java/com/ydtech/modules/esm/model/EsmInsAttachInsure.java

@@ -77,5 +77,4 @@ public class EsmInsAttachInsure implements Serializable {
     private String premium;
 
 
-
 }

src/main/java/com/ydtech/modules/esm/model/EsmInsAttachInsureDetails.java

@@ -58,7 +58,4 @@ public class EsmInsAttachInsureDetails implements Serializable {
     private String premium;
 
 
-
-
-
 }

src/main/java/com/ydtech/modules/esm/model/EsmInsAttribution.java

@@ -1,28 +1,28 @@
 package com.ydtech.modules.esm.model;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.util.List;
 
-import com.ydtech.modules.esm.vo.EsmInsAttributionTemplateVo;
+import com.ydtech.modules.esm.model.vo.EsmInsAttributionTemplateVo;
 import com.ydtech.modules.order.entity.vo.zm.ZmAscriptionVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
 
 /**
  * 归属信息
+ *
  * @TableName esm_ins_attribution
  */
-@TableName(value ="esm_ins_attribution")
+@TableName(value = "esm_ins_attribution")
 @Data
 @ApiModel(description = "归属信息")
 public class EsmInsAttribution implements Serializable {
@@ -31,7 +31,7 @@ public class EsmInsAttribution implements Serializable {
      *
      */
 
-    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     /**
@@ -92,29 +92,28 @@ public class EsmInsAttribution implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
-
     /**
-     *  获取中煤
+     * 获取中煤
      *
      * @author: lig
      * @date: 2023年03月10日 0010
      */
-    public static ZmAscriptionVo gainZmAscriptionVo(EsmInsAttribution eia){
+    public static ZmAscriptionVo gainZmAscriptionVo(EsmInsAttribution eia) {
 
         ZmAscriptionVo zmVo = new ZmAscriptionVo();
         zmVo.setUsername(eia.getUsername());
         zmVo.setPassword(eia.getPassword());
 
 //        String aaa = "[{\"type\": \"text\", \"field\": \"username\", \"label\": \"用户名\", \"value\": \"14002755\", \"isEdit\": 1}, {\"type\": \"text\", \"field\": \"password\", \"label\": \"密码\", \"value\": \"Priv!11101458d72\", \"isEdit\": 1}, {\"type\": \"text\", \"field\": \"comCode\", \"label\": \"业务归属机构\", \"value\": \"14040300\", \"isEdit\": 1}, {\"type\": \"text\", \"field\": \"netPointCode\", \"label\": \"网点代码\", \"value\": \"1404N220162\", \"isEdit\": 1}, {\"type\": \"text\", \"field\": \"handlerCode\", \"label\": \"业务员\", \"value\": \"14A03265\", \"isEdit\": 1}]";
-        List<EsmInsAttributionTemplateVo> fieldList = JSONObject.parseArray(eia.getFields(),EsmInsAttributionTemplateVo.class);
-        fieldList.stream().forEach(a ->{
-            if(a.getField().equals("comCode")){
+        List<EsmInsAttributionTemplateVo> fieldList = JSONObject.parseArray(eia.getFields(), EsmInsAttributionTemplateVo.class);
+        fieldList.stream().forEach(a -> {
+            if (a.getField().equals("comCode")) {
                 zmVo.setInstitutionCode(a.getValue());
             }
-            if(a.getField().equals("netPointCode")){
+            if (a.getField().equals("netPointCode")) {
                 zmVo.setDotCode(a.getValue());
             }
-            if(a.getField().equals("handlerCode")){
+            if (a.getField().equals("handlerCode")) {
                 zmVo.setSalesmanCode(a.getValue());
             }
         });

src/main/java/com/ydtech/modules/esm/model/EsmInsAttributionDept.java

@@ -4,14 +4,17 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
+
 import lombok.Data;
 
 /**
  * 保险公司归属部门表
+ *
  * @TableName esm_ins_attribution_dept
  */
-@TableName(value ="esm_ins_attribution_dept")
+@TableName(value = "esm_ins_attribution_dept")
 @Data
 public class EsmInsAttributionDept implements Serializable {
     /**
@@ -48,8 +51,8 @@ public class EsmInsAttributionDept implements Serializable {
         }
         EsmInsAttributionDept other = (EsmInsAttributionDept) that;
         return (this.getAttributionId() == null ? other.getAttributionId() == null : this.getAttributionId().equals(other.getAttributionId()))
-            && (this.getDeptId() == null ? other.getDeptId() == null : this.getDeptId().equals(other.getDeptId()))
-            && (this.getInsCompanyId() == null ? other.getInsCompanyId() == null : this.getInsCompanyId().equals(other.getInsCompanyId()));
+                && (this.getDeptId() == null ? other.getDeptId() == null : this.getDeptId().equals(other.getDeptId()))
+                && (this.getInsCompanyId() == null ? other.getInsCompanyId() == null : this.getInsCompanyId().equals(other.getInsCompanyId()));
     }
 
     @Override

src/main/java/com/ydtech/modules/esm/model/EsmInsAttributionTemplate.java

@@ -1,5 +1,7 @@
 package com.ydtech.modules.esm.model;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -7,8 +9,11 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ydtech.modules.esm.model.vo.EsmInsAttributionTemplateSaveVo;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * 归属信息模板
@@ -16,12 +21,15 @@ import lombok.Data;
  * @TableName esm_ins_attribution_template
  */
 @TableName(value = "esm_ins_attribution_template")
+@NoArgsConstructor
 @Data
 public class EsmInsAttributionTemplate implements Serializable {
+
+    private static final long serialVersionUID = -3503379281748147886L;
     /**
      *
      */
-    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
@@ -33,12 +41,17 @@ public class EsmInsAttributionTemplate implements Serializable {
     /**
      * 字段集
      */
-    @TableField(value = "fields")
+    @TableField(value = "fields", typeHandler = FastjsonTypeHandler.class)
     @JsonProperty(value = "fields", required = true)
-    private String fields;
+    private JSONArray fields;
 
 //    @TableField(exist = false)
 //    private String value;
 
 
+    public EsmInsAttributionTemplate(EsmInsAttributionTemplateSaveVo esmInsAttributionTemplateSaveVo) {
+        this.insCompanyId = esmInsAttributionTemplateSaveVo.getInsCompanyId();
+        this.fields = JSON.parseArray(JSON.toJSONString(esmInsAttributionTemplateSaveVo.getFields()));
+    }
+
 }

src/main/java/com/ydtech/modules/esm/model/EsmOfferChannel.java

@@ -10,80 +10,81 @@ import io.swagger.annotations.ApiModelProperty;
 //import org.hibernate.validator.constraints.Length;
 
 /**
-* 报价渠道（保险公司）
-* @TableName esm_offer_channel
-*/
+ * 报价渠道（保险公司）
+ *
+ * @TableName esm_offer_channel
+ */
 public class EsmOfferChannel implements Serializable {
 
     private static final long serialVersionUID = 6686921792470764608L;
     /**
-    * 主键
-    */
-    @NotNull(message="[主键]不能为空")
+     * 主键
+     */
+    @NotNull(message = "[主键]不能为空")
     @ApiModelProperty("主键")
     private Integer id;
     /**
-    * 渠道名称
-    */
-    @NotBlank(message="[渠道名称]不能为空")
-    @Size(max= 256,message="编码长度不能超过256")
+     * 渠道名称
+     */
+    @NotBlank(message = "[渠道名称]不能为空")
+    @Size(max = 256, message = "编码长度不能超过256")
     @ApiModelProperty("渠道名称")
 //    @Length(max= 256,message="编码长度不能超过256")
     private String title;
     /**
-    * 图标
-    */
-    @NotBlank(message="[图标]不能为空")
-    @Size(max= 256,message="编码长度不能超过256")
+     * 图标
+     */
+    @NotBlank(message = "[图标]不能为空")
+    @Size(max = 256, message = "编码长度不能超过256")
     @ApiModelProperty("图标")
 //    @Length(max= 256,message="编码长度不能超过256")
     private String image;
     /**
-    * 类别（1.API 2.极速）
-    */
-    @NotNull(message="[类别（1.API 2.极速）]不能为空")
+     * 类别（1.API 2.极速）
+     */
+    @NotNull(message = "[类别（1.API 2.极速）]不能为空")
     @ApiModelProperty("类别（1.API 2.极速）")
     private Integer category;
     /**
-    * 请求路径
-    */
-    @NotBlank(message="[请求路径]不能为空")
-    @Size(max= 256,message="编码长度不能超过256")
+     * 请求路径
+     */
+    @NotBlank(message = "[请求路径]不能为空")
+    @Size(max = 256, message = "编码长度不能超过256")
     @ApiModelProperty("请求路径")
 //    @Length(max= 256,message="编码长度不能超过256")
     private String url;
     /**
-    * 是否开启（1.开启 2.关闭）
-    */
-    @NotNull(message="[是否开启（1.开启 2.关闭）]不能为空")
+     * 是否开启（1.开启 2.关闭）
+     */
+    @NotNull(message = "[是否开启（1.开启 2.关闭）]不能为空")
     @ApiModelProperty("是否开启（1.开启 2.关闭）")
     private Integer isOpen;
     /**
-    * 用户名
-    */
-    @Size(max= 256,message="编码长度不能超过256")
+     * 用户名
+     */
+    @Size(max = 256, message = "编码长度不能超过256")
     @ApiModelProperty("用户名")
 //    @Length(max= 256,message="编码长度不能超过256")
     private String username;
     /**
-    * 密码
-    */
-    @Size(max= 256,message="编码长度不能超过256")
+     * 密码
+     */
+    @Size(max = 256, message = "编码长度不能超过256")
     @ApiModelProperty("密码")
 //    @Length(max= 256,message="编码长度不能超过256")
     private String password;
     /**
-    * 配置信息
-    */
-    @Size(max= -1,message="编码长度不能超过-1")
+     * 配置信息
+     */
+    @Size(max = -1, message = "编码长度不能超过-1")
     @ApiModelProperty("配置信息")
 //    @Length(max= -1,message="编码长度不能超过-1")
     private String configInfo;
     /**
-    * 绑定协议id
-    */
-    @NotBlank(message="[绑定协议id]不能为空")
-    @Size(max= 256,message="编码长度不能超过256")
+     * 绑定协议id
+     */
+    @NotBlank(message = "[绑定协议id]不能为空")
+    @Size(max = 256, message = "编码长度不能超过256")
     @ApiModelProperty("绑定协议id")
 //    @Length(max= 256,message="编码长度不能超过256")
     private String agreementId;

src/main/java/com/ydtech/modules/esm/model/EsmPolicyInformation.java

@@ -3,15 +3,18 @@ package com.ydtech.modules.esm.model;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
+
 import lombok.Data;
 
 /**
  * 中煤保单信息
+ *
  * @TableName esm_policy_information
  */
-@TableName(value ="esm_policy_information")
+@TableName(value = "esm_policy_information")
 @Data
 public class EsmPolicyInformation implements Serializable {
     /**
@@ -85,14 +88,14 @@ public class EsmPolicyInformation implements Serializable {
         }
         EsmPolicyInformation other = (EsmPolicyInformation) that;
         return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getContractMainNo() == null ? other.getContractMainNo() == null : this.getContractMainNo().equals(other.getContractMainNo()))
-            && (this.getContractNo1() == null ? other.getContractNo1() == null : this.getContractNo1().equals(other.getContractNo1()))
-            && (this.getContractNo2() == null ? other.getContractNo2() == null : this.getContractNo2().equals(other.getContractNo2()))
-            && (this.getPremiums1() == null ? other.getPremiums1() == null : this.getPremiums1().equals(other.getPremiums1()))
-            && (this.getPremiums2() == null ? other.getPremiums2() == null : this.getPremiums2().equals(other.getPremiums2()))
-            && (this.getAnnualTaxDue() == null ? other.getAnnualTaxDue() == null : this.getAnnualTaxDue().equals(other.getAnnualTaxDue()))
-            && (this.getSumTaxDefault() == null ? other.getSumTaxDefault() == null : this.getSumTaxDefault().equals(other.getSumTaxDefault()))
-            && (this.getSumTax() == null ? other.getSumTax() == null : this.getSumTax().equals(other.getSumTax()));
+                && (this.getContractMainNo() == null ? other.getContractMainNo() == null : this.getContractMainNo().equals(other.getContractMainNo()))
+                && (this.getContractNo1() == null ? other.getContractNo1() == null : this.getContractNo1().equals(other.getContractNo1()))
+                && (this.getContractNo2() == null ? other.getContractNo2() == null : this.getContractNo2().equals(other.getContractNo2()))
+                && (this.getPremiums1() == null ? other.getPremiums1() == null : this.getPremiums1().equals(other.getPremiums1()))
+                && (this.getPremiums2() == null ? other.getPremiums2() == null : this.getPremiums2().equals(other.getPremiums2()))
+                && (this.getAnnualTaxDue() == null ? other.getAnnualTaxDue() == null : this.getAnnualTaxDue().equals(other.getAnnualTaxDue()))
+                && (this.getSumTaxDefault() == null ? other.getSumTaxDefault() == null : this.getSumTaxDefault().equals(other.getSumTaxDefault()))
+                && (this.getSumTax() == null ? other.getSumTax() == null : this.getSumTax().equals(other.getSumTax()));
     }
 
     @Override

src/main/java/com/ydtech/modules/esm/model/EsmYaPolicyInformation.java

@@ -4,16 +4,19 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
+
 import lombok.Data;
 
 /**
  * 永安保单信息
+ *
  * @TableName esm_ya_policy_information
  */
-@TableName(value ="esm_ya_policy_information")
+@TableName(value = "esm_ya_policy_information")
 @Data
 public class EsmYaPolicyInformation implements Serializable {
     /**
@@ -75,10 +78,10 @@ public class EsmYaPolicyInformation implements Serializable {
         }
         EsmYaPolicyInformation other = (EsmYaPolicyInformation) that;
         return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getPolicyNo() == null ? other.getPolicyNo() == null : this.getPolicyNo().equals(other.getPolicyNo()))
-            && (this.getSumPremium() == null ? other.getSumPremium() == null : this.getSumPremium().equals(other.getSumPremium()))
-            && (this.getSumPayTax() == null ? other.getSumPayTax() == null : this.getSumPayTax().equals(other.getSumPayTax()))
-            && (this.getPolicyDate() == null ? other.getPolicyDate() == null : this.getPolicyDate().equals(other.getPolicyDate()));
+                && (this.getPolicyNo() == null ? other.getPolicyNo() == null : this.getPolicyNo().equals(other.getPolicyNo()))
+                && (this.getSumPremium() == null ? other.getSumPremium() == null : this.getSumPremium().equals(other.getSumPremium()))
+                && (this.getSumPayTax() == null ? other.getSumPayTax() == null : this.getSumPayTax().equals(other.getSumPayTax()))
+                && (this.getPolicyDate() == null ? other.getPolicyDate() == null : this.getPolicyDate().equals(other.getPolicyDate()));
     }
 
     @Override

src/main/java/com/ydtech/modules/esm/model/EsmYcPolicyInformation.java

@@ -3,16 +3,19 @@ package com.ydtech.modules.esm.model;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
+
 import lombok.Data;
 
 /**
  * 永诚保单信息
+ *
  * @TableName esm_yc_policy_information
  */
-@TableName(value ="esm_yc_policy_information")
+@TableName(value = "esm_yc_policy_information")
 @Data
 public class EsmYcPolicyInformation implements Serializable {
     /**
@@ -79,13 +82,13 @@ public class EsmYcPolicyInformation implements Serializable {
         }
         EsmYcPolicyInformation other = (EsmYcPolicyInformation) that;
         return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getLicensePlate() == null ? other.getLicensePlate() == null : this.getLicensePlate().equals(other.getLicensePlate()))
-            && (this.getContractNo1() == null ? other.getContractNo1() == null : this.getContractNo1().equals(other.getContractNo1()))
-            && (this.getContractNo2() == null ? other.getContractNo2() == null : this.getContractNo2().equals(other.getContractNo2()))
-            && (this.getPremiums1() == null ? other.getPremiums1() == null : this.getPremiums1().equals(other.getPremiums1()))
-            && (this.getPremiums2() == null ? other.getPremiums2() == null : this.getPremiums2().equals(other.getPremiums2()))
-            && (this.getTax() == null ? other.getTax() == null : this.getTax().equals(other.getTax()))
-            && (this.getIssueDate() == null ? other.getIssueDate() == null : this.getIssueDate().equals(other.getIssueDate()));
+                && (this.getLicensePlate() == null ? other.getLicensePlate() == null : this.getLicensePlate().equals(other.getLicensePlate()))
+                && (this.getContractNo1() == null ? other.getContractNo1() == null : this.getContractNo1().equals(other.getContractNo1()))
+                && (this.getContractNo2() == null ? other.getContractNo2() == null : this.getContractNo2().equals(other.getContractNo2()))
+                && (this.getPremiums1() == null ? other.getPremiums1() == null : this.getPremiums1().equals(other.getPremiums1()))
+                && (this.getPremiums2() == null ? other.getPremiums2() == null : this.getPremiums2().equals(other.getPremiums2()))
+                && (this.getTax() == null ? other.getTax() == null : this.getTax().equals(other.getTax()))
+                && (this.getIssueDate() == null ? other.getIssueDate() == null : this.getIssueDate().equals(other.getIssueDate()));
     }
 
     @Override

src/main/java/com/ydtech/modules/esm/model/vo/EsmInsAttributionTemplateSaveVo.java

@@ -0,0 +1,26 @@
+package com.ydtech.modules.esm.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author wenks
+ * @version 0.0.2
+ * @description 归属信息模板 保存实体
+ * @date 2023/5/29 10:37
+ */
+@Data
+public class EsmInsAttributionTemplateSaveVo implements Serializable {
+
+    private static final long serialVersionUID = -4101419151648806410L;
+
+    @ApiModelProperty("保险公司ID")
+    private String insCompanyId;
+
+    @ApiModelProperty("字段集")
+    private List<EsmInsAttributionTemplateVo> fields;
+
+}

src/main/java/com/ydtech/modules/esm/vo/EsmInsAttributionTemplateVo.java → src/main/java/com/ydtech/modules/esm/model/vo/EsmInsAttributionTemplateVo.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo;
+package com.ydtech.modules.esm.model.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,25 +14,21 @@ public class EsmInsAttributionTemplateVo implements Serializable {
     private static final long serialVersionUID = 5519839474055384769L;
 
 
-
     /**
      * 字段
      */
-//    @TableField(value = "field")
     @ApiModelProperty(value = "字段")
     private String field;
 
     /**
      * 标签
      */
-//    @TableField(value = "label")
     @ApiModelProperty(value = "标签")
     private String label;
 
     /**
      * 类型（text 文本框，select 选择框）
      */
-//    @TableField(value = "type")
     @ApiModelProperty(value = "类型（text 文本框，select 选择框）")
     private String type;
 
@@ -46,7 +42,6 @@ public class EsmInsAttributionTemplateVo implements Serializable {
     /**
      * 是否允许修改（0 可修改，1 不可修改）
      */
-//    @TableField(value = "is_edit")
     @ApiModelProperty(value = "是否允许修改（0 可修改，1 不可修改）")
     private Integer isEdit;
 
@@ -54,17 +49,16 @@ public class EsmInsAttributionTemplateVo implements Serializable {
     @ApiModelProperty(value = "值")
     private String value;
 
+    public EsmInsAttributionTemplateVo() {
+    }
 
-
-    public EsmInsAttributionTemplateVo(){};
-    public EsmInsAttributionTemplateVo(String field,String label,String value,Integer isEdit){
+    public EsmInsAttributionTemplateVo(String field, String label, String value, Integer isEdit) {
         this.field = field;
         this.label = label;
         this.value = value;
         this.type = "text";
         this.isEdit = isEdit;
-    };
-
+    }
 
 
 }

src/main/java/com/ydtech/modules/esm/vo/EsmInsAttributionVo.java → src/main/java/com/ydtech/modules/esm/model/vo/EsmInsAttributionVo.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo;
+package com.ydtech.modules.esm.model.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -38,9 +38,6 @@ public class EsmInsAttributionVo implements Serializable {
 //    private List<EsmInsAttributionTemplateVo> fieldList;
 
 
-
-
-
 }
 
 

src/main/java/com/ydtech/modules/esm/vo/EsmOfferChannelVo.java → src/main/java/com/ydtech/modules/esm/model/vo/EsmOfferChannelVo.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo;
+package com.ydtech.modules.esm.model.vo;
 
 
 import io.swagger.annotations.ApiModelProperty;
@@ -17,50 +17,50 @@ public class EsmOfferChannelVo implements Serializable {
     /**
      * 渠道名称
      */
-    @NotBlank(message="[渠道名称]不能为空")
-    @Size(max= 256,message="编码长度不能超过256")
+    @NotBlank(message = "[渠道名称]不能为空")
+    @Size(max = 256, message = "编码长度不能超过256")
     @ApiModelProperty("渠道名称")
 //    @Length(max= 256,message="编码长度不能超过256")
     private String title;
     /**
      * 图标
      */
-    @NotBlank(message="[图标]不能为空")
-    @Size(max= 256,message="编码长度不能超过256")
+    @NotBlank(message = "[图标]不能为空")
+    @Size(max = 256, message = "编码长度不能超过256")
     @ApiModelProperty("图标")
 //    @Length(max= 256,message="编码长度不能超过256")
     private String image;
     /**
      * 类别（1.API 2.极速）
      */
-    @NotNull(message="[类别（1.API 2.极速）]不能为空")
+    @NotNull(message = "[类别（1.API 2.极速）]不能为空")
     @ApiModelProperty("类别（1.API 2.极速）")
     private Integer category;
     /**
      * 请求路径
      */
-    @NotBlank(message="[请求路径]不能为空")
-    @Size(max= 256,message="编码长度不能超过256")
+    @NotBlank(message = "[请求路径]不能为空")
+    @Size(max = 256, message = "编码长度不能超过256")
     @ApiModelProperty("请求路径")
 //    @Length(max= 256,message="编码长度不能超过256")
     private String url;
     /**
      * 是否开启（1.开启 2.关闭）
      */
-    @NotNull(message="[是否开启（1.开启 2.关闭）]不能为空")
+    @NotNull(message = "[是否开启（1.开启 2.关闭）]不能为空")
     @ApiModelProperty("是否开启（1.开启 2.关闭）")
     private Integer isOpen;
     /**
      * 用户名
      */
-    @Size(max= 256,message="编码长度不能超过256")
+    @Size(max = 256, message = "编码长度不能超过256")
     @ApiModelProperty("用户名")
 //    @Length(max= 256,message="编码长度不能超过256")
     private String username;
     /**
      * 密码
      */
-    @Size(max= 256,message="编码长度不能超过256")
+    @Size(max = 256, message = "编码长度不能超过256")
     @ApiModelProperty("密码")
 //    @Length(max= 256,message="编码长度不能超过256")
     private String password;
@@ -72,8 +72,8 @@ public class EsmOfferChannelVo implements Serializable {
     /**
      * 绑定协议id
      */
-    @NotBlank(message="[绑定协议id]不能为空")
-    @Size(max= 256,message="编码长度不能超过256")
+    @NotBlank(message = "[绑定协议id]不能为空")
+    @Size(max = 256, message = "编码长度不能超过256")
     @ApiModelProperty("绑定协议id")
 //    @Length(max= 256,message="编码长度不能超过256")
     private String agreementId;

src/main/java/com/ydtech/modules/esm/vo/EsmSalaryQueryVO.java → src/main/java/com/ydtech/modules/esm/model/vo/EsmSalaryQueryVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo;
+package com.ydtech.modules.esm.model.vo;
 
 import com.ydtech.core.page.BasePageVO;
 import io.swagger.annotations.ApiModel;

src/main/java/com/ydtech/modules/esm/vo/EsmSalaryReviewVO.java → src/main/java/com/ydtech/modules/esm/model/vo/EsmSalaryReviewVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo;
+package com.ydtech.modules.esm.model.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/ydtech/modules/esm/vo/EsmSalaryTotalVO.java → src/main/java/com/ydtech/modules/esm/model/vo/EsmSalaryTotalVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo;
+package com.ydtech.modules.esm.model.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/ydtech/modules/esm/vo/EsmSocialSecurityExcelVO.java → src/main/java/com/ydtech/modules/esm/model/vo/EsmSocialSecurityExcelVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo;
+package com.ydtech.modules.esm.model.vo;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/ydtech/modules/esm/vo/EsmSocialSecurityQueryVO.java → src/main/java/com/ydtech/modules/esm/model/vo/EsmSocialSecurityQueryVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo;
+package com.ydtech.modules.esm.model.vo;
 
 import com.ydtech.core.page.BasePageVO;
 import io.swagger.annotations.ApiModel;

src/main/java/com/ydtech/modules/esm/vo/EsmSocialSecurityReviewVO.java → src/main/java/com/ydtech/modules/esm/model/vo/EsmSocialSecurityReviewVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo;
+package com.ydtech.modules.esm.model.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/ydtech/modules/esm/vo/EsmUserInternalVo.java → src/main/java/com/ydtech/modules/esm/model/vo/EsmUserInternalVo.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo;
+package com.ydtech.modules.esm.model.vo;
 
 import lombok.Data;
 

src/main/java/com/ydtech/modules/esm/vo/ExtensionVO.java → src/main/java/com/ydtech/modules/esm/model/vo/ExtensionVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo;
+package com.ydtech.modules.esm.model.vo;
 
 /**
  * @ClassName ExtensionVO

src/main/java/com/ydtech/modules/esm/vo/TeamUserCountPriceVO.java → src/main/java/com/ydtech/modules/esm/model/vo/TeamUserCountPriceVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo;
+package com.ydtech.modules.esm.model.vo;
 
 /**
  * @ClassName TeamUserCountPriceVO

src/main/java/com/ydtech/modules/esm/vo/TeamUserQryVO.java → src/main/java/com/ydtech/modules/esm/model/vo/TeamUserQryVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo;
+package com.ydtech.modules.esm.model.vo;
 
 /**
  * @author qinfenglong

src/main/java/com/ydtech/modules/esm/vo/TeamUserVO.java → src/main/java/com/ydtech/modules/esm/model/vo/TeamUserVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo;
+package com.ydtech.modules.esm.model.vo;
 
 /**
  * @author qinfenglong

src/main/java/com/ydtech/modules/esm/vo/TeamUserVONew.java → src/main/java/com/ydtech/modules/esm/model/vo/TeamUserVONew.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo;
+package com.ydtech.modules.esm.model.vo;
 
 import lombok.Data;
 

src/main/java/com/ydtech/modules/esm/vo/UserRegistVO.java → src/main/java/com/ydtech/modules/esm/model/vo/UserRegistVO.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo;
+package com.ydtech.modules.esm.model.vo;
 
 /**
  * @author qinfenglong

src/main/java/com/ydtech/modules/esm/vo/VoEsmUserInternal.java → src/main/java/com/ydtech/modules/esm/model/vo/VoEsmUserInternal.java

@@ -1,11 +1,9 @@
-package com.ydtech.modules.esm.vo;
+package com.ydtech.modules.esm.model.vo;
 
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.esm.model.EsmUserAgent;
 import com.ydtech.modules.esm.model.EsmUserInternal;
 
-import java.util.List;
-
 public class VoEsmUserInternal {
     private SysUser sysUser;
     private EsmUserInternal esmUserInternal;

src/main/java/com/ydtech/modules/esm/vo/VoEsmUserInternalCheck.java → src/main/java/com/ydtech/modules/esm/model/vo/VoEsmUserInternalCheck.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo;
+package com.ydtech.modules.esm.model.vo;
 
 import com.ydtech.modules.esm.model.EsmUserAgentCheck;
 import com.ydtech.modules.esm.model.EsmUserInternalCheck;

src/main/java/com/ydtech/modules/esm/vo/req/EsmInsAttributionAuthorizeReq.java → src/main/java/com/ydtech/modules/esm/model/vo/req/EsmInsAttributionAuthorizeReq.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo.req;
+package com.ydtech.modules.esm.model.vo.req;
 
 import com.ydtech.core.page.BasePageVO;
 import io.swagger.annotations.ApiModel;
@@ -8,14 +8,14 @@ import lombok.Data;
 import java.util.List;
 
 /**
- *  归属授权  请求
+ * 归属授权  请求
  *
  * @author: lig
  * @date: 2023年03月09日 0009
  */
 @Data
 @ApiModel(value = "归属授权-请求")
-public class EsmInsAttributionAuthorizeReq{
+public class EsmInsAttributionAuthorizeReq {
 
     @ApiModelProperty(value = "部门集合")
     private List<String> deptIds;
@@ -27,5 +27,4 @@ public class EsmInsAttributionAuthorizeReq{
     private String insCompanyId;
 
 
-
 }

src/main/java/com/ydtech/modules/esm/vo/req/EsmInsCompanyReq.java → src/main/java/com/ydtech/modules/esm/model/vo/req/EsmInsCompanyReq.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo.req;
+package com.ydtech.modules.esm.model.vo.req;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/ydtech/modules/esm/vo/req/EsmTrainCountReq.java → src/main/java/com/ydtech/modules/esm/model/vo/req/EsmTrainCountReq.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.esm.vo.req;
+package com.ydtech.modules.esm.model.vo.req;
 
 import com.ydtech.core.page.BasePageVO;
 import io.swagger.annotations.ApiModelProperty;