init: init project step4: biz code support

hnqz-common/hnqz-common-bom/pom.xml

@@ -4,13 +4,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>pigx-cloud-dependencies-parent</artifactId>
-        <groupId>com.pig4cloud</groupId>
-        <version>Hoxton.SR5</version>
+        <artifactId>cloud-dependencies-parent</artifactId>
+        <groupId>com.qunzhixinxi</groupId>
+        <version>1.0.0</version>
         <relativePath/>
     </parent>
 
-    <groupId>com.qunzhixinxi</groupId>
     <artifactId>hnqz-common-bom</artifactId>
     <packaging>pom</packaging>
     <version>3.9.0</version>

hnqz-common/hnqz-common-core/src/main/java/com/qunzhixinxi/hnqz/common/core/util/IDUtils.java

@@ -0,0 +1,18 @@
+package com.qunzhixinxi.hnqz.common.core.util;
+
+import lombok.experimental.UtilityClass;
+
+/**
+ * ID生成
+ *
+ * @author jimmy
+ * @version 1.0.0
+ * @date 2024/05/21 14:24
+ */
+@UtilityClass
+public class IDUtils {
+
+    public static int getId() {
+        return (int) (System.currentTimeMillis() / 1000);
+    }
+}

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/UpmsLevel.java

@@ -1,8 +1,10 @@
 package com.qunzhixinxi.hnqz.admin.api.constant;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 /**
  * 层级标签
@@ -11,11 +13,9 @@ import lombok.Getter;
  * @version 1.0.0
  * @date 2022-11-02 10:53
  */
+@NoArgsConstructor(access = AccessLevel.NONE)
 public final class UpmsLevel {
 
-    private UpmsLevel() {
-    }
-
     // 企业等级
     @Getter
     @AllArgsConstructor
@@ -30,4 +30,23 @@ public final class UpmsLevel {
 
     }
 
+    // 企业等级
+    @Getter
+    @AllArgsConstructor
+    public enum DeptLevel {
+
+
+        L0(0, "系统"),
+        L1(1, "平台"),
+        L2(2, "药企"),
+        L3(3, "一级代理商"),
+        L4(4, "二级代理商");
+
+        @EnumValue
+        private final int level;
+        private final String description;
+
+    }
+
+
 }

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/SysPlanPkg.java

@@ -1,7 +1,6 @@
 package com.qunzhixinxi.hnqz.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmDaAgent.java

@@ -37,12 +37,14 @@ public class WmDaAgent implements Serializable {
     /**
      * 公司名称
      */
-    private String gsmc;
+    @TableField(value = "gsmc")
+    private String entName;
 
     /**
      * 营业执照
      */
-    private String yyzz;
+    @TableField(value = "yyzz")
+    private String bizLicense;
 
     /**
      * 社保缴纳证明
@@ -67,7 +69,6 @@ public class WmDaAgent implements Serializable {
      */
     private String isExamine;
 
-
     /**
      * 证件类型
      */
@@ -76,7 +77,8 @@ public class WmDaAgent implements Serializable {
     /**
      * 证件号码
      */
-    private String zjNumber;
+    @TableField(value = "zj_number")
+    private String regCode;
 
     /**
      * 结算账号
@@ -119,8 +121,7 @@ public class WmDaAgent implements Serializable {
     /**
      * 更新人
      */
-    private String updateUser;
-
+    private Integer updateUser;
 
     private String drugEntId;
 
@@ -137,6 +138,7 @@ public class WmDaAgent implements Serializable {
      * 企业类型
      */
     private String qylx;
+
     /**
      * 企业类型
      */
@@ -173,7 +175,6 @@ public class WmDaAgent implements Serializable {
     @TableField(exist = false)
     private List<Long> areaCodes;
 
-
     @TableField(exist = false)
     private List<Long> entIds;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmScorePackage.java

@@ -1,15 +1,14 @@
 package com.qunzhixinxi.hnqz.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
+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 com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
 import java.io.Serializable;
@@ -33,13 +32,13 @@ public class WmScorePackage implements Serializable {
     /**
      * id
      */
-    @TableId
+    @TableId(type = IdType.AUTO)
     private String id;
 
     /**
      * 计划ID
      */
-	@TableField(exist = false)
+    @TableField(exist = false)
     private Integer planId;
     /**
      * 药企ID
@@ -143,6 +142,7 @@ public class WmScorePackage implements Serializable {
 
     @TableField(exist = false)
     private List<WmScoreTaskType> wmScoreTaskTypeList;
+
     @TableField(exist = false)
     private Set taskTypeSet;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmTaskTypeEntRef.java

@@ -3,10 +3,9 @@ package com.qunzhixinxi.hnqz.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -17,8 +16,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("wm_task_type_ent_ref")
-@EqualsAndHashCode(callSuper = true)
-public class WmTaskTypeEntRef extends Model<WmTaskTypeEntRef> {
+public class WmTaskTypeEntRef implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@TableId

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -182,7 +182,21 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.temporal.ChronoUnit;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
@@ -242,19 +256,6 @@ public class ApiController {
     private final WmPlatformQuizTestResultService platformQuizTestResultService;
     private final ApplicationEventPublisher applicationEventPublisher;
 
-    private static final String[] RANDOM_QUIZ_URL = {
-            "生长抑素测试题一|https://lit.yaoyi.net/s/a26d3dfe2e3b44efa2afdd33d756b285",
-            "生长抑素测试题二|https://lit.yaoyi.net/s/26267505363c428ebc7717b841ed88f7",
-            "生长抑素测试题三|https://lit.yaoyi.net/s/c1610eb36b22480c934b2ea12233ee89",
-            "胸腺法新测试题一|https://lit.yaoyi.net/s/12a5ca1fc3af4c43a7d7239376032a87",
-            "胸腺法新测试题二|https://lit.yaoyi.net/s/b095a052880147d3a9d967cde3a6d060",
-            "胸腺法新测试题三|https://lit.yaoyi.net/s/b7b6f385852144f3a7402dc844a777ea",
-            "阿托西班测试题一|https://lit.yaoyi.net/s/711885d5f83840cea76b7715cdd7359a",
-            "阿托西班测试题二|https://lit.yaoyi.net/s/3c5bac674e1b43c29aab87459216b6ea",
-            "阿托西班测试题三|https://lit.yaoyi.net/s/dc7f31f6d632493596e1d2e0f8345de9"
-
-    };
-
     /**
      * 通过任务类型获取表单配置
      *

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysDeptController.java

@@ -361,9 +361,9 @@ public class SysDeptController {
                 WmDaAgent wmDaAgent = wmDaAgentService.getById(sysDept.getLevel2Id());
                 if (null != wmDaAgent) {
                     if (!"".equals(buildName)) {
-                        buildName = buildName + "-" + wmDaAgent.getGsmc();
+                        buildName = buildName + "-" + wmDaAgent.getEntName();
                     } else {
-                        buildName = wmDaAgent.getGsmc();
+                        buildName = wmDaAgent.getEntName();
                     }
                 }
             }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysExportController.java

@@ -233,7 +233,7 @@ public class SysExportController {
 			xlsTask.setDeptName(sysDept.getName());
 
 			if (sysDept.getLevel() == 2) {
-				xlsTask.setAgentDeptName(wmDaAgent.getGsmc());
+				xlsTask.setAgentDeptName(wmDaAgent.getEntName());
 				xlsTask.setDrugEntName(wmDaDrugEnt.getEntname());
 			}
 			if (sysDept.getLevel() == 3) {
@@ -242,7 +242,7 @@ public class SysExportController {
 				}
 			}else if(sysDept.getLevel() == 4) {
 				if(wmDaAgent!=null) {
-					xlsTask.setDrugEntName(wmDaAgent.getGsmc());
+					xlsTask.setDrugEntName(wmDaAgent.getEntName());
 				}
 			}
 
@@ -379,7 +379,7 @@ public class SysExportController {
 		}
 
 		if (null != wmDaAgent1) {
-			excelMap.put("report_ent", wmDaAgent1.getGsmc());
+			excelMap.put("report_ent", wmDaAgent1.getEntName());
 		} else {
 			excelMap.put("report_ent", "");
 		}
@@ -874,7 +874,7 @@ public class SysExportController {
 
 		WmDaAgent wmDaAgent = wmDaAgentService.getById(agentId);
 		if (null != wmDaAgent) {
-			excelMap.put("wt_ent", wmDaAgent.getGsmc());
+			excelMap.put("wt_ent", wmDaAgent.getEntName());
 		} else {
 			excelMap.put("wt_ent", "");
 		}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaAgentController.java

@@ -157,7 +157,7 @@ public class WmDaAgentController {
             return R.ok(page1);
         }
 
-        List<WmDaAgent> wmDaAgentList = wmDaAgentMapper.selectDeptByIds(resSet, wmDaAgent.getGsmc());
+        List<WmDaAgent> wmDaAgentList = wmDaAgentMapper.selectDeptByIds(resSet, wmDaAgent.getEntName());
 
         if (CollUtil.isEmpty(wmDaAgentList)) {
             return R.ok(page1);
@@ -225,11 +225,11 @@ public class WmDaAgentController {
         Integer deptId = SecurityUtils.getUser().getDeptId();
 
         WmDaAgent query = new WmDaAgent();
-        query.setGsmc(wmDaAgent.getGsmc());
+        query.setEntName(wmDaAgent.getEntName());
         List<WmDaAgent> list1 = wmDaAgentService.list(Wrappers.query(query));
 
         WmDaAgent wmDaAgent4 = new WmDaAgent();
-        wmDaAgent4.setZjNumber(wmDaAgent.getZjNumber());
+        wmDaAgent4.setRegCode(wmDaAgent.getRegCode());
         List<WmDaAgent> list5 = wmDaAgentMapper.selectList(Wrappers.query(wmDaAgent4));
         List<WmDaAgent> list3 = wmDaAgentMapper.selectByGsmcList(query);
         SysDeptRelation sysDeptRelation = new SysDeptRelation();
@@ -270,7 +270,7 @@ public class WmDaAgentController {
             wmDaAgent1.setDeptId(sysDept.getDeptId());
             WmDaAgent wmDaAgent2 = wmDaAgentMapper.selectByDeptId(wmDaAgent1);
             if (wmDaDrugEnt1 == null && wmDaAgent2 != null) {
-                wmDaAgent.setTemp1(wmDaAgent2.getGsmc());
+                wmDaAgent.setTemp1(wmDaAgent2.getEntName());
             }
             if (wmDaAgentService.saveAgent(wmDaAgent)) {
                 WmRelation wmRelation = new WmRelation();
@@ -402,7 +402,7 @@ public class WmDaAgentController {
                 wmRelation.setUpId(Integer.valueOf(wmDaAgent2.getDeptId()));
                 WmDaAgent wmDaAgent3 = wmDaAgentMapper.selectByGsmc(query);
                 wmDaAgent3.setExtDrugEnt(list1.get(0).getExtDrugEnt() + "," + wmDaAgent2.getId());
-                wmDaAgent3.setTemp1(list1.get(0).getTemp1() + "," + wmDaAgent2.getGsmc());
+                wmDaAgent3.setTemp1(list1.get(0).getTemp1() + "," + wmDaAgent2.getEntName());
                 wmDaAgentMapper.updateById(wmDaAgent3);
             }
             List<WmRelation> list2 = wmRelationService.list(Wrappers.query(wmRelation));
@@ -477,9 +477,9 @@ public class WmDaAgentController {
 
         SysDept sysDept = sysDeptMapper.selectById(wmDaAgent.getDeptId());
         sysDept.setDelFlag(wmDaAgent.getEnableFlag());
-        sysDept.setName(wmDaAgent.getGsmc());
+        sysDept.setName(wmDaAgent.getEntName());
         sysDept.setDeptId(wmDaAgent.getDeptId());
-        sysDept.setTaxCode(wmDaAgent.getZjNumber());
+        sysDept.setTaxCode(wmDaAgent.getRegCode());
         sysDeptMapper.updateByPrimaryKeySelective(sysDept);
 
         SysUser sysUser1 = new SysUser();
@@ -548,7 +548,7 @@ public class WmDaAgentController {
                 daAgentList.forEach(wmDaAgent -> {
                     Map<String, String> agentMap = new HashMap<>();
                     agentMap.put("value", wmDaAgent.getId().toString());
-                    agentMap.put("name", wmDaAgent.getGsmc());
+                    agentMap.put("name", wmDaAgent.getEntName());
                     result.add(agentMap);
                 });
             }
@@ -606,13 +606,13 @@ public class WmDaAgentController {
         wmDaAgent.setEnableFlag("0");
         List<WmDaAgent> listWmDaAgent;
         String gsmc;
-        if (null != wmDaAgent.getGsmc()) {
-            gsmc = wmDaAgent.getGsmc();
-            wmDaAgent.setGsmc(null);
+        if (null != wmDaAgent.getEntName()) {
+            gsmc = wmDaAgent.getEntName();
+            wmDaAgent.setEntName(null);
             if (CollUtil.isNotEmpty(stringList)) {
-                listWmDaAgent = wmDaAgentService.selectByScope(Wrappers.query(wmDaAgent).lambda().like(WmDaAgent::getGsmc, gsmc).in(WmDaAgent::getId, stringList));
+                listWmDaAgent = wmDaAgentService.selectByScope(Wrappers.query(wmDaAgent).lambda().like(WmDaAgent::getEntName, gsmc).in(WmDaAgent::getId, stringList));
             } else {
-                listWmDaAgent = wmDaAgentService.selectByScope(Wrappers.query(wmDaAgent).lambda().like(WmDaAgent::getGsmc, gsmc));
+                listWmDaAgent = wmDaAgentService.selectByScope(Wrappers.query(wmDaAgent).lambda().like(WmDaAgent::getEntName, gsmc));
             }
         } else {
             if (CollUtil.isNotEmpty(stringList)) {
@@ -664,13 +664,13 @@ public class WmDaAgentController {
         wmDaAgent.setEnableFlag("0");
         List<WmDaAgent> listWmDaAgent;
         String gsmc;
-        if (null != wmDaAgent.getGsmc()) {
-            gsmc = wmDaAgent.getGsmc();
-            wmDaAgent.setGsmc(null);
+        if (null != wmDaAgent.getEntName()) {
+            gsmc = wmDaAgent.getEntName();
+            wmDaAgent.setEntName(null);
             if (CollUtil.isNotEmpty(stringList)) {
-                listWmDaAgent = wmDaAgentService.list(Wrappers.query(wmDaAgent).lambda().like(WmDaAgent::getGsmc, gsmc).in(WmDaAgent::getId, stringList));
+                listWmDaAgent = wmDaAgentService.list(Wrappers.query(wmDaAgent).lambda().like(WmDaAgent::getEntName, gsmc).in(WmDaAgent::getId, stringList));
             } else {
-                listWmDaAgent = wmDaAgentService.list(Wrappers.query(wmDaAgent).lambda().like(WmDaAgent::getGsmc, gsmc));
+                listWmDaAgent = wmDaAgentService.list(Wrappers.query(wmDaAgent).lambda().like(WmDaAgent::getEntName, gsmc));
             }
         } else {
             if (CollUtil.isNotEmpty(stringList)) {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaDrugEntController.java

@@ -6,18 +6,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.dto.UserInfo;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptCsm;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.EnableEnum;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaAgent;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskType;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskTypeEntRef;
-import com.qunzhixinxi.hnqz.admin.mapper.SysDeptCsmMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.SysDeptMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.SysUserMapper;
-import com.qunzhixinxi.hnqz.admin.mapper.WmTaskTypeEntRefMapper;
-import com.qunzhixinxi.hnqz.admin.mapper.WmTaskTypeMapper;
 import com.qunzhixinxi.hnqz.admin.service.SysCsmUserRelationService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.SysEnterpriseAreaService;
@@ -71,12 +65,9 @@ public class WmDaDrugEntController {
     private final WmDaAgentService wmDaAgentService;
     private final SysUserService userService;
     private final SysDeptService sysDeptService;
-    private final WmTaskTypeEntRefMapper wmTaskTypeEntRefMapper;
-    private final WmTaskTypeMapper wmTaskTypeMapper;
     private final SysDeptMapper sysDeptMapper;
     private final SysUserMapper sysUserMapper;
     private final SysCsmUserRelationService sysCsmUserRelationService;
-    private final SysDeptCsmMapper sysDeptCsmMapper;
     private final RedisTemplate<String, Object> redisTemplate;
     private final SysEnterpriseAreaService enterpriseAreaService;
 
@@ -118,86 +109,26 @@ public class WmDaDrugEntController {
     /**
      * 新增档案-药企
      *
-     * @param wmDaDrugEnt 档案-药企
-     * @return R
+     * @param entity 企业信息
+     * @return 保存结果
      */
     @SysLog("新增档案-药企")
     @PostMapping("/saves")
     @PreAuthorize("@pms.hasPermission('admin_wmdadrugent_add')")
-    @Transactional(rollbackFor = Exception.class)
-    public R<?> saves(@Validated(value = BaseEntity.Create.class) @RequestBody WmDaDrugEnt wmDaDrugEnt) {
+    public R<?> saves(@Validated(value = BaseEntity.Create.class) @RequestBody WmDaDrugEnt entity) {
 
 
         int count = wmDaDrugEntService.count(Wrappers.<WmDaDrugEnt>lambdaQuery()
-                .eq(WmDaDrugEnt::getEntname, wmDaDrugEnt.getEntname())
+                .eq(WmDaDrugEnt::getEntname, entity.getEntname())
                 .or()
-                .eq(WmDaDrugEnt::getEntcode, wmDaDrugEnt.getEntcode())
+                .eq(WmDaDrugEnt::getEntcode, entity.getEntcode())
         );
 
         if (count != 0) {
             return R.failed("药企公司名称或统一社会信用代码已存在");
         }
 
-        wmDaDrugEnt.setManagement("1");
-        wmDaDrugEnt.setPgqx("1");
-        if (wmDaDrugEntService.saveDrugEnts(wmDaDrugEnt)) {
-            log.info("+++++++++++{}", wmDaDrugEnt.getDeptId());
-            SysDept sysDept = sysDeptService.getById(wmDaDrugEnt.getDeptId());
-            if (2 == sysDept.getLevel()) {
-                WmTaskTypeEntRef wmTaskTypeEntRef = new WmTaskTypeEntRef();
-                wmTaskTypeEntRef.setDrugentId(wmDaDrugEnt.getId());
-                wmTaskTypeEntRef.setAgentId(wmDaDrugEnt.getId());
-                WmTaskType wmTaskType = new WmTaskType();
-                wmTaskType.setDurgentId(wmDaDrugEnt.getId());
-                wmTaskType.setDelFlag("0");
-                List<WmTaskType> lists = wmTaskTypeMapper.selectList(Wrappers.query(wmTaskType));
-                if (CollUtil.isNotEmpty(lists)) {
-                    return R.failed("一代积分规则已分配");
-                } else {
-                    wmTaskTypeEntRef.setDeptId(wmDaDrugEnt.getDeptId().toString());
-                    wmTaskTypeEntRefMapper.insert(wmTaskTypeEntRef);
-
-                    WmTaskType wmTaskTypeQ = new WmTaskType();
-                    wmTaskTypeQ.setTaskTypeLevel("1");
-                    wmTaskTypeQ.setStatus("0");
-                    wmTaskTypeQ.setDelFlag("0");
-
-                    List<WmTaskType> tempList = wmTaskTypeMapper.selectList(Wrappers.query(wmTaskTypeQ));
-
-                    for (WmTaskType wmTaskType1 : tempList) {
-                        wmTaskType1.setId(null);
-//						newOne.setLevel1Id(wmTaskTypeEntRef.getAgentId());
-                        wmTaskType1.setDurgentId(wmTaskTypeEntRef.getAgentId());
-                        wmTaskType1.setTaskTypeLevel("2");
-                        wmTaskType1.setTaskEntId(wmTaskTypeEntRef.getAgentId());
-                        wmTaskType1.setDeptId(wmDaDrugEnt.getDeptId());
-                        wmTaskType1.setCreateTime(LocalDateTime.now());
-                        wmTaskType1.setStatus("0");
-                        wmTaskType1.setBaseId(wmTaskType1.getId());
-                        wmTaskType1.setRuleId(wmTaskTypeEntRef.getAgentId().toString());
-                        wmTaskType1.setParentId(wmTaskType1.getParentId());
-                        wmTaskTypeMapper.insert(wmTaskType1);
-                    }
-                }
-            }
-
-            // CSM创建的企业,负责人默认是该CSM
-            Integer userId = SecurityUtils.getUser().getId();
-            SysUser user = sysUserMapper.selectById(userId);
-            SysDeptCsm insert = new SysDeptCsm();
-            insert.setDeptId(wmDaDrugEnt.getDeptId());
-            insert.setUserId(userId);
-            insert.setCsmName(user.getRealname());
-            sysDeptCsmMapper.insert(insert);
-
-            // 区域
-            enterpriseAreaService.saveRelation(Long.valueOf(wmDaDrugEnt.getDeptId()), wmDaDrugEnt.getAreaCodes());
-
-        }
-        wmDaDrugEnt.setCreateTime(LocalDateTime.now());
-
-
-        return R.ok(Boolean.TRUE);
+        return R.ok(wmDaDrugEntService.saveDrugEnt(entity, SecurityUtils.getUser()));
     }
 
     /**

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -1453,7 +1453,7 @@ public class WmScorePackageController {
                     wmScorePackage.setAcceptSug(daDrugEnt.getEntname());
                 }
             } else {
-                wmScorePackage.setAcceptSugName(daAgent.getGsmc());
+                wmScorePackage.setAcceptSugName(daAgent.getEntName());
             }
         }
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskController.java

@@ -946,7 +946,7 @@ public class WmTaskController {
 
         WmDaAgent wmDaAgent = wmDaAgentService.getById(wmScorePackage.getLevel1Id());
         if (null != wmDaAgent) {
-            map.put("ent", wmDaAgent.getGsmc());
+            map.put("ent", wmDaAgent.getEntName());
         } else {
             map.put("ent", "");
         }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskTypeController.java

@@ -115,7 +115,7 @@ public class WmTaskTypeController {
                 if (null != daAgent) {
                     Map<String, String> map = new HashMap<>();
                     map.put("value", output.getRuleId());
-                    map.put("label", daAgent.getGsmc());
+                    map.put("label", daAgent.getEntName());
                     if (daAgent.getDeptId().equals(deptId)) {
                         resultList2.add(map);
                     } else {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmDaAgentService.java

@@ -26,7 +26,7 @@ public interface WmDaAgentService extends IService<WmDaAgent> {
 
 	 List<WmDaAgent> selectByScope(Wrapper<WmDaAgent> queryWrapper);
 
-	 boolean saveAgent(WmDaAgent wmDaAgent);
+	 Boolean saveAgent(WmDaAgent wmDaAgent);
 
 	WmDaAgent selectByDeptId(Integer deptId);
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmDaDrugEntService.java

@@ -1,10 +1,10 @@
 package com.qunzhixinxi.hnqz.admin.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt;
+import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 
 import java.util.List;
 import java.util.Map;
@@ -17,23 +17,16 @@ import java.util.Map;
  */
 public interface WmDaDrugEntService extends IService<WmDaDrugEnt> {
 
-    /**
-     * 保存药企
-     *
-     * @param wmDaDrugEnt 药企信息
-     * @return 结果
-     */
-    boolean saveDrugEnt(WmDaDrugEnt wmDaDrugEnt);
-
     List<WmDaDrugEnt> selectByScope(Wrapper<WmDaDrugEnt> queryWrapper);
 
     /**
      * 保存药企
      *
      * @param wmDaDrugEnt 药企信息
+     * @param operator    操作人
      * @return 保存结果
      */
-    boolean saveDrugEnts(WmDaDrugEnt wmDaDrugEnt);
+    Boolean saveDrugEnt(WmDaDrugEnt wmDaDrugEnt, HnqzUser operator);
 
     WmDaDrugEnt selectByDeptId(Integer deptId);
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysExportServiceImpl.java

@@ -234,7 +234,7 @@ public class SysExportServiceImpl implements SysExportService {
 
 		WmDaAgent wmDaAgent = wmDaAgentService.getById(agentId);
 		if (null != wmDaAgent) {
-			excelMap.put("wt_ent", wmDaAgent.getGsmc());
+			excelMap.put("wt_ent", wmDaAgent.getEntName());
 		} else {
 			excelMap.put("wt_ent", "");
 		}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysUserServiceImpl.java

@@ -918,8 +918,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String p1 = userPwd.getP1();
         String p2 = userPwd.getP2();
         String userName = userPwd.getUserName();
-        List<SysUser> userList = baseMapper.selectList(Wrappers.<SysUser>lambdaQuery().
-                eq(SysUser::getUsername, userName));
+        List<SysUser> userList = baseMapper.selectList(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getUsername, userName));
         if (CollectionUtils.isEmpty(userList)) {
             return R.failed("用户不存在");
         }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaAgentServiceImpl.java

@@ -130,21 +130,21 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
         return wmDaAgentMapper.selectListByScope(queryWrapper, new DataScope());
     }
 
-    public boolean saveAgent(WmDaAgent wmDaAgent) {
+    public Boolean saveAgent(WmDaAgent wmDaAgent) {
         Integer deptId = SecurityUtils.getUser().getDeptId();
         SysDept queryDept = sysDeptMapper.selectById(deptId);
 
         wmDaAgent.setCreateTime(LocalDateTime.now());
         boolean isSave = super.save(wmDaAgent);
-        List<SysDept> list = sysDeptMapper.selectByName(wmDaAgent.getGsmc());
+        List<SysDept> list = sysDeptMapper.selectByName(wmDaAgent.getEntName());
         if (isSave) {
 
             if (SecurityUtils.getRoles().contains(3)) {
                 if (CollUtil.isEmpty(list)) {
                     SysDept sysDept = new SysDept();
                     sysDept.setDeptId((int) System.currentTimeMillis() / 1000);
-                    sysDept.setName(wmDaAgent.getGsmc());
-                    sysDept.setTaxCode(wmDaAgent.getZjNumber());
+                    sysDept.setName(wmDaAgent.getEntName());
+                    sysDept.setTaxCode(wmDaAgent.getRegCode());
                     sysDept.setLevel(3);
                     sysDept.setExpiryDate(queryDept.getExpiryDate());
                     sysDeptService.save(sysDept);
@@ -178,9 +178,9 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
                 if (CollUtil.isEmpty(list)) {
                     SysDept sysDept = new SysDept();
                     sysDept.setDeptId((int) System.currentTimeMillis() / 1000);
-                    sysDept.setName(wmDaAgent.getGsmc());
+                    sysDept.setName(wmDaAgent.getEntName());
                     sysDept.setLevel(4);
-                    sysDept.setTaxCode(wmDaAgent.getZjNumber());
+                    sysDept.setTaxCode(wmDaAgent.getRegCode());
                     sysDept.setExpiryDate(queryDept.getExpiryDate());
                     sysDeptService.save(sysDept);
                     wmDaAgent.setDeptId(sysDept.getDeptId());
@@ -220,11 +220,11 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
     public Page<WmDaAgent> selectWmManagementList(Page<WmDaAgent> page, WmDaAgent wmDaAgent) {
 
         QueryWrapper queryWrapper = Wrappers.query();
-        if (null != wmDaAgent.getGsmc()) {
-            queryWrapper.like("gsmc", wmDaAgent.getGsmc());
+        if (null != wmDaAgent.getEntName()) {
+            queryWrapper.like("gsmc", wmDaAgent.getEntName());
         }
-        if (null != wmDaAgent.getZjNumber()) {
-            queryWrapper.like("zjNamber", wmDaAgent.getZjNumber());
+        if (null != wmDaAgent.getRegCode()) {
+            queryWrapper.like("zjNamber", wmDaAgent.getRegCode());
         }
 
         List<Long> areaIds;
@@ -256,10 +256,10 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
         LocalDateTime now = LocalDateTime.now();
 
         WmDaAgent query = new WmDaAgent();
-        query.setGsmc(wmDaAgent.getGsmc());
+        query.setEntName(wmDaAgent.getEntName());
         List<WmDaAgent> list1 = wmDaAgentMapper.selectList(Wrappers.query(query));
         WmDaAgent wmDaAgent1 = new WmDaAgent();
-        wmDaAgent1.setZjNumber(wmDaAgent.getZjNumber());
+        wmDaAgent1.setRegCode(wmDaAgent.getRegCode());
         List<WmDaAgent> list2 = wmDaAgentMapper.selectList(Wrappers.query(wmDaAgent1));
 
         if (CollUtil.isNotEmpty(list1)) {
@@ -289,21 +289,21 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
         wmDaAgent.setManagement(String.valueOf(1));
         wmDaAgent.setPgqx("1");
         super.save(wmDaAgent);
-        List<SysDept> list3 = sysDeptMapper.selectByName(wmDaAgent.getGsmc());
+        List<SysDept> list3 = sysDeptMapper.selectByName(wmDaAgent.getEntName());
         int deptId;
         if (list3.size() == 0) {
             SysDept sysDept = new SysDept();
             sysDept.setDeptId((int) System.currentTimeMillis() / 1000);
-            sysDept.setTaxCode(wmDaAgent.getZjNumber());
+            sysDept.setTaxCode(wmDaAgent.getRegCode());
             sysDept.setDeptPermissions(wmDaAgent.getDeptPermissions());
             sysDept.setFinancialReviewType(wmDaAgent.getFinancialReviewType());
             sysDept.setExpiryDate(now.plusYears(1L).toLocalDate());
             if (wmDaAgent.getQylx().contains("0")) {
-                sysDept.setName(wmDaAgent.getGsmc());
+                sysDept.setName(wmDaAgent.getEntName());
                 sysDept.setLevel(3);
                 sysDeptService.save(sysDept);
             } else {
-                sysDept.setName(wmDaAgent.getGsmc());
+                sysDept.setName(wmDaAgent.getEntName());
                 sysDept.setLevel(5);
                 sysDeptService.save(sysDept);
             }
@@ -440,7 +440,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
     @Transactional(rollbackFor = Exception.class)
     public R updateByPrimaryKeySelective(WmDaAgent wmDaAgent) {
         WmDaAgent query = new WmDaAgent();
-        query.setGsmc(wmDaAgent.getGsmc());
+        query.setEntName(wmDaAgent.getEntName());
         List<WmDaAgent> list1 = wmDaAgentMapper.selectList(Wrappers.query(query));
 
         if (list1.size() > 1) {
@@ -455,7 +455,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
                 String[] ents = wmDaAgent.getExtDrugEnt().split(",");
                 agentList = this.listByIds(Arrays.asList(ents));
                 if (CollectionUtil.isNotEmpty(agentList)) {
-                    List<String> gsmcList = agentList.stream().map(WmDaAgent::getGsmc).collect(Collectors.toList());
+                    List<String> gsmcList = agentList.stream().map(WmDaAgent::getEntName).collect(Collectors.toList());
                     wmDaAgent.setTemp1(String.join(",", gsmcList));
                 }
             }
@@ -530,12 +530,12 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
         sysDept1.setDeptId(wmDaAgent.getDeptId());
         SysDept sysDept = sysDeptMapper.selectDept(sysDept1);
         sysDept.setDelFlag(wmDaAgent.getEnableFlag());
-        sysDept.setName(wmDaAgent.getGsmc());
+        sysDept.setName(wmDaAgent.getEntName());
         sysDept.setDeptId(wmDaAgent.getDeptId());
 //		sysDept.setSubjectType(wmDaAgent.getSubjectType());
 
 
-        sysDept.setTaxCode(wmDaAgent.getZjNumber());
+        sysDept.setTaxCode(wmDaAgent.getRegCode());
 
 //		if(!Arrays.equals(sysDept.getSubjectType(),wmDaAgent.getSubjectType())){
 //
@@ -759,7 +759,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
                 for (WmDaAgent wmDaAgent : wmDaAgentList) {
                     WmDept wmDept = new WmDept();
                     wmDept.setDeptId(wmDaAgent.getDeptId());
-                    wmDept.setName(wmDaAgent.getGsmc());
+                    wmDept.setName(wmDaAgent.getEntName());
                     wmDeptList.add(wmDept);
                 }
             }
@@ -787,15 +787,15 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
         WmDaDrugEnt wmDaDrugEnt = new WmDaDrugEnt();
         Integer wmDaDrugEnts = null;
         if (deptIds.getLevel() == 2) {
-            deptIds.setName(wmDaAgent.getGsmc());
+            deptIds.setName(wmDaAgent.getEntName());
             sysDeptService.updateById(deptIds);
             wmDaDrugEnt.setId(wmDaAgent.getId());
-            wmDaDrugEnt.setEntname(wmDaAgent.getGsmc());
-            wmDaDrugEnt.setEntcode(wmDaAgent.getZjNumber());
+            wmDaDrugEnt.setEntname(wmDaAgent.getEntName());
+            wmDaDrugEnt.setEntcode(wmDaAgent.getRegCode());
             wmDaDrugEnt.setManagement(wmDaAgent.getManagement());
             wmDaDrugEnts = wmDaDrugEntMapper.updateById(wmDaDrugEnt);
         } else if (deptIds.getLevel() == 3 || deptIds.getLevel() == 4) {
-            deptIds.setName(wmDaAgent.getGsmc());
+            deptIds.setName(wmDaAgent.getEntName());
             sysDeptService.updateById(deptIds);
             wmDaDrugEnts = wmDaAgentMapper.updateById(wmDaAgent);
         } else {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaDrugEntServiceImpl.java

@@ -2,17 +2,21 @@ package com.qunzhixinxi.hnqz.admin.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsLevel;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysAreaEntity;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptCsm;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRelation;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskType;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskTypeEntRef;
 import com.qunzhixinxi.hnqz.admin.mapper.WmDaDrugEntMapper;
 import com.qunzhixinxi.hnqz.admin.service.SysAreaEntityService;
+import com.qunzhixinxi.hnqz.admin.service.SysDeptCsmService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptRelationService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.SysEnterpriseAreaService;
@@ -20,9 +24,15 @@ import com.qunzhixinxi.hnqz.admin.service.SysUserAreaService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionPercentRuleService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionRuleService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskTypeEntRefService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskTypeService;
+import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
+import com.qunzhixinxi.hnqz.common.core.util.IDUtils;
 import com.qunzhixinxi.hnqz.common.data.datascope.DataScope;
+import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -39,6 +49,7 @@ import java.util.stream.Collectors;
  * @author gaoyanng
  * @date 2020-06-25 23:35:42
  */
+@Slf4j
 @Service
 @AllArgsConstructor
 public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaDrugEnt> implements WmDaDrugEntService {
@@ -51,56 +62,10 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
     private final WmTaskSubmissionPercentRuleService taskSubmissionPercentRuleService;
     private final SysUserAreaService sysUserAreaService;
     private final SysAreaEntityService areaEntityService;
+    private final WmTaskTypeService taskTypeService;
+    private final WmTaskTypeEntRefService taskTypeEntRefService;
+    private final SysDeptCsmService deptCsmService;
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public boolean saveDrugEnt(WmDaDrugEnt entity) {
-        Integer deptId = Integer.parseInt(System.currentTimeMillis() / 1000 + "");
-        entity.setDeptId(deptId);
-        entity.setCreateTime(LocalDateTime.now());
-        boolean isSave = super.save(entity);
-        if (isSave) {
-            SysDept sysDept = new SysDept();
-            sysDept.setDeptId(deptId);
-            sysDept.setName(entity.getEntname());
-            sysDept.setLevel(2);
-            sysDept.setLevel1Id(entity.getId());
-            sysDept.setLevel1Name(entity.getEntname());
-            sysDept.setTaxCode(entity.getEntcode());
-            sysDept.setFinancialReviewType(entity.getFinancialReviewType());
-            sysDept.setDeptPermissions(entity.getDeptPermissions());
-            /**
-             * @Modify: start
-             * @Author: ryz
-             * @Date: 2021/4/19
-             */
-            if (sysDeptService.saveDept(sysDept) > 0) {
-
-//				Map<String, Integer> subjectTypeAndChannel = entity.getSubjectTypeAndChannel();
-//				if (CollUtil.isNotEmpty(subjectTypeAndChannel)) {
-//					for (Map.Entry<String, Integer> entry : subjectTypeAndChannel.entrySet()) {
-//						SysDeptSub deptSub = new SysDeptSub();
-//						deptSub.setDeptId(sysDept.getDeptId());
-//						deptSub.setSubjectChannel(entry.getValue());
-//						deptSub.setSubjectType(entry.getKey());
-//						deptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
-//						deptSub.setUpdateTime(sysDept.getCreateTime());
-//						sysDeptSubMapper.insert(deptSub);
-//
-//					}
-//				}
-                return true;
-            }
-            return false;
-
-            /**
-             * @Modify: end
-             */
-
-//			return sysDeptService.saveDept(sysDept) > 0 ? true : false;
-        }
-        return false;
-    }
 
     @Override
     public List<WmDaDrugEnt> selectByScope(Wrapper<WmDaDrugEnt> queryWrapper) {
@@ -108,44 +73,133 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 
     }
 
+    /**
+     * 保存药企
+     *
+     * @param entity   药企信息
+     * @param operator 操作人
+     * @return 保存结果
+     */
     @Override
-    public boolean saveDrugEnts(WmDaDrugEnt entity) {
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean saveDrugEnt(WmDaDrugEnt entity, HnqzUser operator) {
 
+        // 保存药企信息
         LocalDateTime now = LocalDateTime.now();
-        Integer deptId = (int) System.currentTimeMillis() / 1000;
+        Integer userId = operator.getId();
+        Integer ancestorId = operator.getDeptId();
+        Integer deptId = IDUtils.getId();
         entity.setDeptId(deptId);
         entity.setCreateTime(now);
-        entity.setCreateUser(SecurityUtils.getUser().getId());
-
-        if (super.save(entity)) {
-            SysDept sysDept = new SysDept();
-            sysDept.setDeptId(deptId);
-            sysDept.setName(entity.getEntname());
-            sysDept.setLevel(2);
-            sysDept.setDeptPermissions(entity.getDeptPermissions());
-            sysDept.setFinancialReviewType(entity.getFinancialReviewType());
-            sysDept.setExpiryDate(now.plusYears(1L).toLocalDate());
-            sysDeptService.save(sysDept);
-
-            List<SysDeptRelation> newList = new ArrayList<>(2);
-            SysDeptRelation sysDeptRelation = new SysDeptRelation();
-            sysDeptRelation.setAncestor(SecurityUtils.getUser().getDeptId());
-            sysDeptRelation.setDescendant(deptId);
-            newList.add(sysDeptRelation);
-            SysDeptRelation sysDeptRelation1 = new SysDeptRelation();
-            sysDeptRelation1.setAncestor(deptId);
-            sysDeptRelation1.setDescendant(deptId);
-            newList.add(sysDeptRelation1);
-            sysDeptRelationService.saveBatch(newList);
-
-            // 初始化任务规则
-            taskSubmissionRuleService.initDeptTaskSubmissionRule(Collections.singleton(deptId));
-            // 初始化企业的任务类型配置的信息
-            taskSubmissionPercentRuleService.initTaskTypeConfigRule(Collections.singleton(deptId));
-
-            return true;
+        entity.setManagement("1");
+        entity.setPgqx("1");
+        entity.setCreateTime(now);
+        entity.setUpdateTime(now);
+        entity.setCreateUser(userId);
+        entity.setUpdateUser(userId);
+
+        this.save(entity);
+
+        // 映射部门表
+        SysDept sysDept = new SysDept();
+        sysDept.setDeptId(deptId);
+        sysDept.setName(entity.getEntname());
+        sysDept.setLevel(UpmsLevel.DeptLevel.L2.getLevel());
+        sysDept.setDeptPermissions(entity.getDeptPermissions());
+        sysDept.setFinancialReviewType(entity.getFinancialReviewType());
+        sysDept.setIssueDate(now.toLocalDate());
+        sysDept.setExpiryDate(now.plusYears(99L).toLocalDate());
+        sysDept.setCreateTime(now);
+        sysDept.setUpdateTime(now);
+        sysDeptService.save(sysDept);
+
+        // 构建部门关联
+        List<SysDeptRelation> rels = new ArrayList<>(2);
+        SysDeptRelation r1 = new SysDeptRelation();
+        r1.setAncestor(ancestorId);
+        r1.setDescendant(deptId);
+        rels.add(r1);
+        SysDeptRelation r2 = new SysDeptRelation();
+        r2.setAncestor(deptId);
+        r2.setDescendant(deptId);
+        rels.add(r2);
+        sysDeptRelationService.saveBatch(rels);
+
+        // 初始化任务规则
+        taskSubmissionRuleService.initDeptTaskSubmissionRule(Collections.singleton(deptId));
+        // 初始化企业的任务类型配置的信息
+        taskSubmissionPercentRuleService.initTaskTypeConfigRule(Collections.singleton(deptId));
+
+        // 企业关联任务类型
+        List<WmTaskType> taskTypes = taskTypeService.list(Wrappers.<WmTaskType>lambdaQuery()
+                .eq(WmTaskType::getDelFlag, CommonConstants.STATUS_NORMAL)
+                .eq(WmTaskType::getDurgentId, entity.getId()));
+
+        if (CollUtil.isNotEmpty(taskTypes)) {
+            log.info("企业{}, 积分规则已经分配", entity.getId());
         }
-        return false;
+
+        WmTaskTypeEntRef wmTaskTypeEntRef = new WmTaskTypeEntRef();
+        wmTaskTypeEntRef.setDrugentId(entity.getId());
+        wmTaskTypeEntRef.setAgentId(entity.getId());
+        wmTaskTypeEntRef.setDeptId(deptId.toString());
+        wmTaskTypeEntRef.setCreateTime(now);
+        wmTaskTypeEntRef.setUpdateTime(now);
+        wmTaskTypeEntRef.setCreateUser(userId);
+        wmTaskTypeEntRef.setUpdateUser(userId);
+        wmTaskTypeEntRef.setDelFlag(CommonConstants.STATUS_NORMAL);
+        wmTaskTypeEntRef.setEnableFlag(CommonConstants.STATUS_NORMAL);
+        wmTaskTypeEntRef.setTenantId(operator.getTenantId());
+        taskTypeEntRefService.save(wmTaskTypeEntRef);
+
+
+        List<WmTaskType> types = taskTypeService.list(Wrappers.<WmTaskType>lambdaQuery()
+                        .eq(WmTaskType::getDelFlag, CommonConstants.STATUS_NORMAL)
+                        .eq(WmTaskType::getStatus, CommonConstants.STATUS_NORMAL)
+                        .eq(WmTaskType::getTaskTypeLevel, "1")).stream()
+                .map(tt -> {
+                    WmTaskType t = new WmTaskType();
+                    t.setTaskTypeName(tt.getTaskTypeName());
+                    t.setTaskTypeLevel("2");
+                    t.setStatus(CommonConstants.STATUS_NORMAL);
+                    t.setDurgentId(entity.getId());
+                    t.setLevel1Id(tt.getLevel1Id());
+                    t.setTaskEntId(entity.getId());
+                    t.setScore(tt.getScore());
+                    t.setTaskScoreStart(tt.getTaskScoreStart());
+                    t.setTaskScoreEnd(tt.getTaskScoreEnd());
+                    t.setDeptId(deptId);
+                    t.setDelFlag(CommonConstants.STATUS_NORMAL);
+                    t.setEnableFlag(CommonConstants.STATUS_NORMAL);
+                    t.setTenantId(tt.getTenantId());
+                    t.setCreateTime(now);
+                    t.setCreateUser(userId);
+                    t.setUpdateTime(now);
+                    t.setUpdateUser(userId);
+                    t.setBaseId(tt.getId());
+                    t.setRealFlag(tt.getRealFlag());
+                    t.setRuleId(entity.getId().toString());
+                    t.setParentId(tt.getParentId());
+                    t.setTaskReceiverType(tt.getTaskReceiverType());
+                    t.setTaskRemark(tt.getTaskRemark());
+                    return t;
+                }).collect(Collectors.toList());
+
+        taskTypeService.saveBatch(types);
+
+        // CSM创建的企业,负责人默认是该CSM
+        SysDeptCsm insert = new SysDeptCsm();
+        insert.setDeptId(deptId);
+        insert.setUserId(userId);
+        insert.setCsmName(operator.getRealName());
+        deptCsmService.save(insert);
+
+        // 区域
+        enterpriseAreaService.saveRelation(Long.valueOf(deptId), entity.getAreaCodes());
+
+        return Boolean.TRUE;
+
+
     }
 
     @Override
@@ -182,7 +236,7 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
             areas = wmDaDrugEnt.getAreaCodes();
         } else {
             areas = sysUserAreaService.listUserAreas(Long.valueOf(SecurityUtils.getUser().getId()));
-            if (CollUtil.isNotEmpty(areas)){
+            if (CollUtil.isNotEmpty(areas)) {
                 areas = areaEntityService.list(Wrappers.<SysAreaEntity>lambdaQuery()
                                 .in(SysAreaEntity::getAreaId, areas)
                                 .eq(SysAreaEntity::getAreaStatus, Boolean.TRUE)

hnqz-upms/hnqz-upms-biz/src/test/java/com/qunzhixinxi/hnqz/admin/WmTaskTypeServiceTest.java

@@ -1,389 +0,0 @@
-package com.qunzhixinxi.hnqz.admin;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.qunzhixinxi.hnqz.admin.api.constant.enums.DelEnum;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRelation;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskType;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmDaAgent;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskType;
-import com.qunzhixinxi.hnqz.admin.mapper.SysDeptMapper;
-import com.qunzhixinxi.hnqz.admin.mapper.SysDeptRelationMapper;
-import com.qunzhixinxi.hnqz.admin.mapper.WmDaAgentMapper;
-import com.qunzhixinxi.hnqz.admin.mapper.WmDaDrugEntMapper;
-import com.qunzhixinxi.hnqz.admin.mapper.WmTaskTypeMapper;
-import com.qunzhixinxi.hnqz.admin.util.AmountToCNUtil;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 批量同步指定的任务类型给所有企业
- *
- * @author lixuesong
- * @date 2021年11月22日 18:55
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = {HnqzAdminApplication.class, Test.class})
-public class WmTaskTypeServiceTest {
-
-	@Autowired
-	private WmTaskTypeMapper wmTaskTypeMapper;
-
-	@Autowired
-	private SysDeptMapper sysDeptMapper;
-
-	@Autowired
-	private SysDeptRelationMapper sysDeptRelationMapper;
-
-	@Autowired
-	private WmDaDrugEntMapper wmDaDrugEntMapper;
-
-	@Autowired
-	private WmDaAgentMapper wmDaAgentMapper;
-	
-	// 任务类型list
-	private static final List<String> taskTypeIdList = new ArrayList<String>(){{
-		add("1");
-		add("2");
-		add("3");
-		add("4");
-		add("5");
-		add("6");
-		add("7");
-		add("8");
-		add("9");
-		add("10");
-		add("11");
-		add("12");
-		add("13");
-		add("14");
-		add("15");
-		add("16");
-		add("17");
-		add("18");
-		add("19");
-		add("21");
-		add("22");
-		add("23");
-		add("24");
-		add("25");
-		add("26");
-		add("27");
-		add("28");
-		add("30");
-		add("31");
-		add("32");
-		add("33");
-		add("34");
-		add("35");
-		add("36");
-		add("37");
-		add("38");
-		add("39");
-		add("40");
-		add("41");
-		add("42");
-		add("43");
-		add("44");
-		add("45");
-		add("46");
-		add("47");
-		add("48");
-		add("49");
-		add("50");
-		add("51");
-		add("52");
-		add("53");
-		add("54");
-		add("55");
-		add("56");
-		add("57");
-		add("58");
-		add("59");
-		add("60");
-		add("61");
-		add("62");
-		add("63");
-		add("64");
-		add("65");
-		add("66");
-		add("67");
-		add("68");
-		add("69");
-		add("70");
-		add("71");
-		add("72");
-		add("73");
-		add("74");
-		add("75");
-		add("76");
-		add("801");
-	}};
-
-	/**
-	 * 批量同步指定的任务类型给所有企业
-	 */
-//	@Test
-	public void test() {
-		List<WmTaskType> tempList = wmTaskTypeMapper.selectBatchIds(taskTypeIdList);
-
-		// 1.第一级是药企的情况
-//		List<SysDept> deptList = sysDeptMapper.selectList(Wrappers.<SysDept>lambdaQuery()
-//				.eq(SysDept::getLevel, 2));
-		List<SysDept> sysDepts1 = sysDeptMapper.listAllDept();
-		List<SysDept> deptList = new ArrayList<>();
-		if (CollectionUtil.isNotEmpty(sysDepts1)) {
-			deptList = sysDepts1.stream()
-					.filter(sysDept -> sysDept.getLevel().equals(2))
-					.collect(Collectors.toList());
-		}
-		// 遍历药企
-		for (SysDept dept : deptList) {
-			// 生成药企任务类型
-			WmDaDrugEnt wmDaDrugEnt = wmDaDrugEntMapper.selectOne(Wrappers.<WmDaDrugEnt>lambdaQuery()
-					.eq(WmDaDrugEnt::getDeptId, dept.getDeptId())
-//					.eq(WmDaDrugEnt::getEnableFlag, EnableEnum.ENABLE.val())
-					.eq(WmDaDrugEnt::getDelFlag, DelEnum.NOT_DEL.getVal()));
-			if (wmDaDrugEnt == null) {
-				continue;
-			}
-			for (WmTaskType wmTaskType1 : tempList) {
-				WmTaskType newOne = BeanUtil.copyProperties(wmTaskType1, WmTaskType.class);
-				newOne.setCreateTime(null);
-				newOne.setId(null);
-				newOne.setDurgentId(wmDaDrugEnt.getId());
-				newOne.setTaskTypeLevel("2");
-				newOne.setTaskEntId(wmDaDrugEnt.getId());
-				newOne.setDeptId(wmDaDrugEnt.getDeptId());
-				newOne.setStatus("0");
-				newOne.setBaseId(wmTaskType1.getId());
-				newOne.setRuleId(String.valueOf(wmDaDrugEnt.getId()));
-				newOne.setParentId(wmTaskType1.getParentId());
-				newOne.setTaskReceiverType(wmTaskType1.getTaskReceiverType());
-				List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
-						.eq(WmTaskType::getTaskTypeName, wmTaskType1.getTaskTypeName())
-						.eq(WmTaskType::getRuleId, newOne.getRuleId())
-						.eq(WmTaskType::getDeptId, newOne.getDeptId())
-						.eq(WmTaskType::getTaskEntId, newOne.getTaskEntId()));
-				if (CollectionUtil.isEmpty(taskTypeList)) {
-					newOne.setCreateTime(LocalDateTime.now());
-					wmTaskTypeMapper.insert(newOne);
-				}
-			}
-
-			// 查询一级CSO
-			List<SysDeptRelation> deptRelationList = sysDeptRelationMapper.selectList(Wrappers.<SysDeptRelation>lambdaQuery()
-					.eq(SysDeptRelation::getAncestor, dept.getDeptId())
-					.ne(SysDeptRelation::getDescendant, dept.getDeptId()));
-			if (CollectionUtil.isEmpty(deptRelationList)) {
-				continue;
-			}
-			List<Integer> oneCSODeptIdList = deptRelationList.stream()
-					.map(SysDeptRelation::getDescendant)
-					.collect(Collectors.toList());
-			List<SysDept> oneCSODeptList = sysDeptMapper.selectByIds(oneCSODeptIdList);
-//			List<SysDept> oneCSODeptList = sysDeptMapper.selectList(Wrappers.<SysDept>lambdaQuery()
-//					.eq(SysDept::getParentId, dept.getDeptId())
-//					.eq(SysDept::getDelFlag, DelEnum.NOT_DEL.getVal())
-//					.eq(SysDept::getLevel, 3));
-			for (SysDept oneCSODept : oneCSODeptList) {
-				// 生成药企给一级CSO的任务类型
-				WmDaAgent wmDaAgent = wmDaAgentMapper.selectOne(Wrappers.<WmDaAgent>lambdaQuery()
-						.eq(WmDaAgent::getDelFlag, DelEnum.NOT_DEL.getVal())
-//						.eq(WmDaAgent::getEnableFlag, EnableEnum.ENABLE.val())
-						.eq(WmDaAgent::getDeptId, oneCSODept.getDeptId()));
-				if (wmDaAgent == null) {
-					continue;
-				}
-				for (WmTaskType wmTaskType1 : tempList) {
-					WmTaskType newOne = BeanUtil.copyProperties(wmTaskType1, WmTaskType.class);
-					newOne.setCreateTime(null);
-					newOne.setId(null);
-					newOne.setLevel1Id(wmDaAgent.getId());
-					newOne.setDurgentId(wmDaDrugEnt.getId());
-					newOne.setTaskTypeLevel("2");
-					newOne.setRuleId("" +wmDaDrugEnt.getId() + wmDaAgent.getId());
-					newOne.setTaskEntId(wmDaAgent.getId());
-					newOne.setDeptId(wmDaAgent.getDeptId());
-					newOne.setStatus("0");
-					newOne.setBaseId(wmTaskType1.getId());
-					newOne.setTaskReceiverType(wmTaskType1.getTaskReceiverType());
-					List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
-							.eq(WmTaskType::getTaskTypeName, wmTaskType1.getTaskTypeName())
-							.eq(WmTaskType::getRuleId, newOne.getRuleId())
-							.eq(WmTaskType::getDeptId, newOne.getDeptId())
-							.eq(WmTaskType::getTaskEntId, newOne.getTaskEntId()));
-					if (CollectionUtil.isEmpty(taskTypeList)) {
-						newOne.setCreateTime(LocalDateTime.now());
-						wmTaskTypeMapper.insert(newOne);
-					}
-				}
-				// 生成一级CSO的任务类型
-				for (WmTaskType wmTaskType2 : tempList) {
-					WmTaskType newOne = BeanUtil.copyProperties(wmTaskType2, WmTaskType.class);
-					newOne.setCreateTime(null);
-					newOne.setId(null);
-					newOne.setLevel1Id(wmDaAgent.getId());
-					newOne.setTaskTypeLevel("2");
-					newOne.setTaskEntId(wmDaAgent.getId());
-					newOne.setRuleId(String.valueOf(wmDaAgent.getId()));
-					newOne.setDeptId(wmDaAgent.getDeptId());
-					newOne.setStatus("0");
-					newOne.setBaseId(wmTaskType2.getId());
-					newOne.setTaskReceiverType(wmTaskType2.getTaskReceiverType());
-					List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
-							.eq(WmTaskType::getTaskTypeName, wmTaskType2.getTaskTypeName())
-							.eq(WmTaskType::getRuleId, newOne.getRuleId())
-							.eq(WmTaskType::getDeptId, newOne.getDeptId())
-							.eq(WmTaskType::getTaskEntId, newOne.getTaskEntId()));
-					if (CollectionUtil.isEmpty(taskTypeList)) {
-						newOne.setCreateTime(LocalDateTime.now());
-						wmTaskTypeMapper.insert(newOne);
-					}
-				}
-
-				// 查询二级CSO
-				List<SysDept> twoCSODeptList = sysDeptMapper.selectList(Wrappers.<SysDept>lambdaQuery()
-						.eq(SysDept::getParentId, oneCSODept.getDeptId())
-//						.eq(SysDept::getDelFlag, DelEnum.NOT_DEL.getVal())
-						.eq(SysDept::getLevel, 4));
-				for (SysDept twoCSODept : twoCSODeptList) {
-					// 生成二级CSO任务类型
-					WmDaAgent wmDaAgent2 = wmDaAgentMapper.selectOne(Wrappers.<WmDaAgent>lambdaQuery()
-							.eq(WmDaAgent::getDelFlag, DelEnum.NOT_DEL.getVal())
-//							.eq(WmDaAgent::getEnableFlag, EnableEnum.ENABLE.val())
-							.eq(WmDaAgent::getDeptId, twoCSODept.getDeptId()));
-					if (wmDaAgent2 == null) {
-						continue;
-					}
-					for (WmTaskType wmTaskType2 : tempList) {
-						WmTaskType newOne = BeanUtil.copyProperties(wmTaskType2, WmTaskType.class);
-						newOne.setCreateTime(null);
-						newOne.setId(null);
-						newOne.setLevel1Id(wmDaAgent2.getId());
-						newOne.setTaskTypeLevel("2");
-						newOne.setTaskEntId(wmDaAgent2.getId());
-						newOne.setRuleId(String.valueOf(wmDaAgent2.getId()));
-						newOne.setDeptId(wmDaAgent2.getDeptId());
-						newOne.setStatus("0");
-						newOne.setBaseId(wmTaskType2.getId());
-						newOne.setTaskReceiverType(wmTaskType2.getTaskReceiverType());
-						List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
-								.eq(WmTaskType::getTaskTypeName, wmTaskType2.getTaskTypeName())
-								.eq(WmTaskType::getRuleId, newOne.getRuleId())
-								.eq(WmTaskType::getDeptId, newOne.getDeptId())
-								.eq(WmTaskType::getTaskEntId, newOne.getTaskEntId()));
-						if (CollectionUtil.isEmpty(taskTypeList)) {
-							newOne.setCreateTime(LocalDateTime.now());
-							wmTaskTypeMapper.insert(newOne);
-						}
-					}
-				}
-
-			}
-
-		}
-
-		// 2.第一级是CSO的情况
-//		List<SysDept> deptList2 = sysDeptMapper.selectList(Wrappers.<SysDept>lambdaQuery()
-//				.eq(SysDept::getLevel, 3)
-//				.isNull(SysDept::getParentId));
-		List<SysDept> sysDepts = sysDeptMapper.listAllDept();
-		List<SysDept> deptList2 = new ArrayList<>();
-		if (CollectionUtil.isNotEmpty(sysDepts)) {
-			deptList2 = sysDepts.stream()
-					.filter(sysDept -> sysDept.getLevel().equals(3) && sysDept.getParentId() == null)
-					.collect(Collectors.toList());
-		}
-		// 查询一级CSO
-		for (SysDept oneCSODept : deptList2) {
-			// 生成药企给一级CSO的任务类型
-			WmDaAgent wmDaAgent = wmDaAgentMapper.selectOne(Wrappers.<WmDaAgent>lambdaQuery()
-					.eq(WmDaAgent::getDelFlag, DelEnum.NOT_DEL.getVal())
-//					.eq(WmDaAgent::getEnableFlag, EnableEnum.ENABLE.val())
-					.eq(WmDaAgent::getDeptId, oneCSODept.getDeptId()));
-			if (wmDaAgent == null) {
-				continue;
-			}
-			// 生成一级CSO的任务类型
-			for (WmTaskType wmTaskType2 : tempList) {
-				WmTaskType newOne = BeanUtil.copyProperties(wmTaskType2, WmTaskType.class);
-				newOne.setCreateTime(null);
-				newOne.setId(null);
-				newOne.setLevel1Id(wmDaAgent.getId());
-				newOne.setTaskTypeLevel("2");
-				newOne.setTaskEntId(wmDaAgent.getId());
-				newOne.setRuleId(String.valueOf(wmDaAgent.getId()));
-				newOne.setDeptId(wmDaAgent.getDeptId());
-				newOne.setStatus("0");
-				newOne.setBaseId(wmTaskType2.getId());
-				newOne.setTaskReceiverType(wmTaskType2.getTaskReceiverType());
-				List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
-						.eq(WmTaskType::getTaskTypeName, wmTaskType2.getTaskTypeName())
-						.eq(WmTaskType::getRuleId, newOne.getRuleId())
-						.eq(WmTaskType::getDeptId, newOne.getDeptId())
-						.eq(WmTaskType::getTaskEntId, newOne.getTaskEntId()));
-				if (CollectionUtil.isEmpty(taskTypeList)) {
-					newOne.setCreateTime(LocalDateTime.now());
-					wmTaskTypeMapper.insert(newOne);
-				}
-			}
-
-			// 查询二级CSO
-			List<SysDept> twoCSODeptList = sysDeptMapper.selectList(Wrappers.<SysDept>lambdaQuery()
-					.eq(SysDept::getParentId, oneCSODept.getDeptId())
-//					.eq(SysDept::getDelFlag, DelEnum.NOT_DEL.getVal())
-					.eq(SysDept::getLevel, 4));
-			for (SysDept twoCSODept : twoCSODeptList) {
-				// 生成二级CSO任务类型
-				WmDaAgent wmDaAgent2 = wmDaAgentMapper.selectOne(Wrappers.<WmDaAgent>lambdaQuery()
-						.eq(WmDaAgent::getDelFlag, DelEnum.NOT_DEL.getVal())
-//						.eq(WmDaAgent::getEnableFlag, EnableEnum.ENABLE.val())
-						.eq(WmDaAgent::getDeptId, twoCSODept.getDeptId()));
-				if (wmDaAgent2 == null) {
-					continue;
-				}
-				for (WmTaskType wmTaskType2 : tempList) {
-					WmTaskType newOne = BeanUtil.copyProperties(wmTaskType2, WmTaskType.class);
-					newOne.setCreateTime(null);
-					newOne.setId(null);
-					newOne.setLevel1Id(wmDaAgent2.getId());
-					newOne.setTaskTypeLevel("2");
-					newOne.setTaskEntId(wmDaAgent2.getId());
-					newOne.setRuleId(String.valueOf(wmDaAgent2.getId()));
-					newOne.setDeptId(wmDaAgent2.getDeptId());
-					newOne.setStatus("0");
-					newOne.setBaseId(wmTaskType2.getId());
-					newOne.setTaskReceiverType(wmTaskType2.getTaskReceiverType());
-					List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
-						.eq(WmTaskType::getTaskTypeName, wmTaskType2.getTaskTypeName())
-						.eq(WmTaskType::getRuleId, newOne.getRuleId())
-						.eq(WmTaskType::getDeptId, newOne.getDeptId())
-						.eq(WmTaskType::getTaskEntId, newOne.getTaskEntId()));
-					if (CollectionUtil.isEmpty(taskTypeList)) {
-						newOne.setCreateTime(LocalDateTime.now());
-						wmTaskTypeMapper.insert(newOne);
-					}
-				}
-			}
-		}
-	}
-
-
-//	public static void main(String[] args) {
-//		String s = AmountToCNUtil.number2CNMontrayUnit(new BigDecimal("323337.08"));
-//		System.out.println(s);
-//	}
-}