init: init project step4: biz code support

hnqz-common/hnqz-common-security/src/main/java/com/qunzhixinxi/hnqz/common/security/component/HnqzUserAuthenticationConverter.java

@@ -66,7 +66,7 @@ public class HnqzUserAuthenticationConverter implements UserAuthenticationConver
             Map<String, ?> map = MapUtil.get(responseMap, SecurityConstants.DETAILS_USER, Map.class);
             validateTenantId(map);
             String username = MapUtil.getStr(map, SecurityConstants.DETAILS_USERNAME);
-            String realName = MapUtil.getStr(map, "realname");
+            String realName = MapUtil.getStr(map, "realName");
             Integer id = MapUtil.getInt(map, SecurityConstants.DETAILS_USER_ID);
             Integer deptId = MapUtil.getInt(map, SecurityConstants.DETAILS_DEPT_ID);
             Integer tenantId = MapUtil.getInt(map, SecurityConstants.DETAILS_TENANT_ID);

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

@@ -37,14 +37,12 @@ public class WmDaAgent implements Serializable {
     /**
      * 公司名称
      */
-    @TableField(value = "gsmc")
-    private String entName;
+    private String gsmc;
 
     /**
      * 营业执照
      */
-    @TableField(value = "yyzz")
-    private String bizLicense;
+    private String yyzz;
 
     /**
      * 社保缴纳证明
@@ -77,8 +75,7 @@ public class WmDaAgent implements Serializable {
     /**
      * 证件号码
      */
-    @TableField(value = "zj_number")
-    private String regCode;
+    private String zjNumber;
 
     /**
      * 结算账号

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

@@ -24,6 +24,7 @@ public class WmTaskType implements Serializable {
      * 任务类型名称
      */
     private String taskTypeName;
+
     /**
      * 任务类型级别
      */

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.getEntName();
+                        buildName = buildName + "-" + wmDaAgent.getGsmc();
                     } else {
-                        buildName = wmDaAgent.getEntName();
+                        buildName = wmDaAgent.getGsmc();
                     }
                 }
             }

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.getEntName());
+				xlsTask.setAgentDeptName(wmDaAgent.getGsmc());
 				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.getEntName());
+					xlsTask.setDrugEntName(wmDaAgent.getGsmc());
 				}
 			}
 
@@ -379,7 +379,7 @@ public class SysExportController {
 		}
 
 		if (null != wmDaAgent1) {
-			excelMap.put("report_ent", wmDaAgent1.getEntName());
+			excelMap.put("report_ent", wmDaAgent1.getGsmc());
 		} 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.getEntName());
+			excelMap.put("wt_ent", wmDaAgent.getGsmc());
 		} 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.getEntName());
+        List<WmDaAgent> wmDaAgentList = wmDaAgentMapper.selectDeptByIds(resSet, wmDaAgent.getGsmc());
 
         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.setEntName(wmDaAgent.getEntName());
+        query.setGsmc(wmDaAgent.getGsmc());
         List<WmDaAgent> list1 = wmDaAgentService.list(Wrappers.query(query));
 
         WmDaAgent wmDaAgent4 = new WmDaAgent();
-        wmDaAgent4.setRegCode(wmDaAgent.getRegCode());
+        wmDaAgent4.setZjNumber(wmDaAgent.getZjNumber());
         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.getEntName());
+                wmDaAgent.setTemp1(wmDaAgent2.getGsmc());
             }
             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.getEntName());
+                wmDaAgent3.setTemp1(list1.get(0).getTemp1() + "," + wmDaAgent2.getGsmc());
                 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.getEntName());
+        sysDept.setName(wmDaAgent.getGsmc());
         sysDept.setDeptId(wmDaAgent.getDeptId());
-        sysDept.setTaxCode(wmDaAgent.getRegCode());
+        sysDept.setTaxCode(wmDaAgent.getZjNumber());
         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.getEntName());
+                    agentMap.put("name", wmDaAgent.getGsmc());
                     result.add(agentMap);
                 });
             }
@@ -606,13 +606,13 @@ public class WmDaAgentController {
         wmDaAgent.setEnableFlag("0");
         List<WmDaAgent> listWmDaAgent;
         String gsmc;
-        if (null != wmDaAgent.getEntName()) {
-            gsmc = wmDaAgent.getEntName();
-            wmDaAgent.setEntName(null);
+        if (null != wmDaAgent.getGsmc()) {
+            gsmc = wmDaAgent.getGsmc();
+            wmDaAgent.setGsmc(null);
             if (CollUtil.isNotEmpty(stringList)) {
-                listWmDaAgent = wmDaAgentService.selectByScope(Wrappers.query(wmDaAgent).lambda().like(WmDaAgent::getEntName, gsmc).in(WmDaAgent::getId, stringList));
+                listWmDaAgent = wmDaAgentService.selectByScope(Wrappers.query(wmDaAgent).lambda().like(WmDaAgent::getGsmc, gsmc).in(WmDaAgent::getId, stringList));
             } else {
-                listWmDaAgent = wmDaAgentService.selectByScope(Wrappers.query(wmDaAgent).lambda().like(WmDaAgent::getEntName, gsmc));
+                listWmDaAgent = wmDaAgentService.selectByScope(Wrappers.query(wmDaAgent).lambda().like(WmDaAgent::getGsmc, gsmc));
             }
         } else {
             if (CollUtil.isNotEmpty(stringList)) {
@@ -664,13 +664,13 @@ public class WmDaAgentController {
         wmDaAgent.setEnableFlag("0");
         List<WmDaAgent> listWmDaAgent;
         String gsmc;
-        if (null != wmDaAgent.getEntName()) {
-            gsmc = wmDaAgent.getEntName();
-            wmDaAgent.setEntName(null);
+        if (null != wmDaAgent.getGsmc()) {
+            gsmc = wmDaAgent.getGsmc();
+            wmDaAgent.setGsmc(null);
             if (CollUtil.isNotEmpty(stringList)) {
-                listWmDaAgent = wmDaAgentService.list(Wrappers.query(wmDaAgent).lambda().like(WmDaAgent::getEntName, gsmc).in(WmDaAgent::getId, stringList));
+                listWmDaAgent = wmDaAgentService.list(Wrappers.query(wmDaAgent).lambda().like(WmDaAgent::getGsmc, gsmc).in(WmDaAgent::getId, stringList));
             } else {
-                listWmDaAgent = wmDaAgentService.list(Wrappers.query(wmDaAgent).lambda().like(WmDaAgent::getEntName, gsmc));
+                listWmDaAgent = wmDaAgentService.list(Wrappers.query(wmDaAgent).lambda().like(WmDaAgent::getGsmc, gsmc));
             }
         } else {
             if (CollUtil.isNotEmpty(stringList)) {

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.getEntName());
+                wmScorePackage.setAcceptSugName(daAgent.getGsmc());
             }
         }
 

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.getEntName());
+            map.put("ent", wmDaAgent.getGsmc());
         } else {
             map.put("ent", "");
         }

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

@@ -20,9 +20,7 @@ import com.qunzhixinxi.hnqz.admin.service.WmTaskTypeService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskTypeSubCate2Service;
 import com.qunzhixinxi.hnqz.common.core.constant.enums.CommonFlag;
 import com.qunzhixinxi.hnqz.common.core.util.R;
-import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.MediaType;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,13 +31,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.NotEmpty;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
@@ -59,7 +55,6 @@ public class WmTaskSubmissionRuleController {
 	private final WmTaskTypeSubCate2Service wmTaskTypeSubCate2Service;
 	private final WmTaskSubmissionPercentRuleService taskSubmissionPercentRuleService;
 	private final WmTaskTypeService wmTaskTypeService;
-	private final RedisTemplate<String, Object> redisTemplate;
 
 
 	/**
@@ -79,6 +74,7 @@ public class WmTaskSubmissionRuleController {
 	 * @param deptId 企业id
 	 * @return 任务类型列表
 	 */
+	@SuppressWarnings("unchecked")
 	@GetMapping("/list-task-type")
 	public R<?> listTaskType(@RequestParam(value = "deptId") Integer deptId) {
 
@@ -192,6 +188,7 @@ public class WmTaskSubmissionRuleController {
 	 * @param requestMap 请求参数
 	 * @return 结果
 	 */
+	@SuppressWarnings("unchecked")
 	@PostMapping("/update-task-type")
 	public R<Boolean> updateEnableTaskType(@RequestBody Map<String, Object> requestMap) {
 		List<String> taskTypeIds = (List<String>) requestMap.get("taskTypeIds");

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.getEntName());
+                    map.put("label", daAgent.getGsmc());
                     if (daAgent.getDeptId().equals(deptId)) {
                         resultList2.add(map);
                     } else {

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

@@ -1,7 +1,6 @@
 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.WmDaAgent;

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.getEntName());
+			excelMap.put("wt_ent", wmDaAgent.getGsmc());
 		} else {
 			excelMap.put("wt_ent", "");
 		}

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

@@ -136,15 +136,15 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 
         wmDaAgent.setCreateTime(LocalDateTime.now());
         boolean isSave = super.save(wmDaAgent);
-        List<SysDept> list = sysDeptMapper.selectByName(wmDaAgent.getEntName());
+        List<SysDept> list = sysDeptMapper.selectByName(wmDaAgent.getGsmc());
         if (isSave) {
 
             if (SecurityUtils.getRoles().contains(3)) {
                 if (CollUtil.isEmpty(list)) {
                     SysDept sysDept = new SysDept();
                     sysDept.setDeptId((int) System.currentTimeMillis() / 1000);
-                    sysDept.setName(wmDaAgent.getEntName());
-                    sysDept.setTaxCode(wmDaAgent.getRegCode());
+                    sysDept.setName(wmDaAgent.getGsmc());
+                    sysDept.setTaxCode(wmDaAgent.getZjNumber());
                     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.getEntName());
+                    sysDept.setName(wmDaAgent.getGsmc());
                     sysDept.setLevel(4);
-                    sysDept.setTaxCode(wmDaAgent.getRegCode());
+                    sysDept.setTaxCode(wmDaAgent.getZjNumber());
                     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.getEntName()) {
-            queryWrapper.like("gsmc", wmDaAgent.getEntName());
+        if (null != wmDaAgent.getGsmc()) {
+            queryWrapper.like("gsmc", wmDaAgent.getGsmc());
         }
-        if (null != wmDaAgent.getRegCode()) {
-            queryWrapper.like("zjNamber", wmDaAgent.getRegCode());
+        if (null != wmDaAgent.getZjNumber()) {
+            queryWrapper.like("zjNamber", wmDaAgent.getZjNumber());
         }
 
         List<Long> areaIds;
@@ -256,10 +256,10 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
         LocalDateTime now = LocalDateTime.now();
 
         WmDaAgent query = new WmDaAgent();
-        query.setEntName(wmDaAgent.getEntName());
+        query.setGsmc(wmDaAgent.getGsmc());
         List<WmDaAgent> list1 = wmDaAgentMapper.selectList(Wrappers.query(query));
         WmDaAgent wmDaAgent1 = new WmDaAgent();
-        wmDaAgent1.setRegCode(wmDaAgent.getRegCode());
+        wmDaAgent1.setZjNumber(wmDaAgent.getZjNumber());
         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.getEntName());
+        List<SysDept> list3 = sysDeptMapper.selectByName(wmDaAgent.getGsmc());
         int deptId;
         if (list3.size() == 0) {
             SysDept sysDept = new SysDept();
             sysDept.setDeptId((int) System.currentTimeMillis() / 1000);
-            sysDept.setTaxCode(wmDaAgent.getRegCode());
+            sysDept.setTaxCode(wmDaAgent.getZjNumber());
             sysDept.setDeptPermissions(wmDaAgent.getDeptPermissions());
             sysDept.setFinancialReviewType(wmDaAgent.getFinancialReviewType());
             sysDept.setExpiryDate(now.plusYears(1L).toLocalDate());
             if (wmDaAgent.getQylx().contains("0")) {
-                sysDept.setName(wmDaAgent.getEntName());
+                sysDept.setName(wmDaAgent.getGsmc());
                 sysDept.setLevel(3);
                 sysDeptService.save(sysDept);
             } else {
-                sysDept.setName(wmDaAgent.getEntName());
+                sysDept.setName(wmDaAgent.getGsmc());
                 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.setEntName(wmDaAgent.getEntName());
+        query.setGsmc(wmDaAgent.getGsmc());
         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::getEntName).collect(Collectors.toList());
+                    List<String> gsmcList = agentList.stream().map(WmDaAgent::getGsmc).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.getEntName());
+        sysDept.setName(wmDaAgent.getGsmc());
         sysDept.setDeptId(wmDaAgent.getDeptId());
 //		sysDept.setSubjectType(wmDaAgent.getSubjectType());
 
 
-        sysDept.setTaxCode(wmDaAgent.getRegCode());
+        sysDept.setTaxCode(wmDaAgent.getZjNumber());
 
 //		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.getEntName());
+                    wmDept.setName(wmDaAgent.getGsmc());
                     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.getEntName());
+            deptIds.setName(wmDaAgent.getGsmc());
             sysDeptService.updateById(deptIds);
             wmDaDrugEnt.setId(wmDaAgent.getId());
-            wmDaDrugEnt.setEntname(wmDaAgent.getEntName());
-            wmDaDrugEnt.setEntcode(wmDaAgent.getRegCode());
+            wmDaDrugEnt.setEntname(wmDaAgent.getGsmc());
+            wmDaDrugEnt.setEntcode(wmDaAgent.getZjNumber());
             wmDaDrugEnt.setManagement(wmDaAgent.getManagement());
             wmDaDrugEnts = wmDaDrugEntMapper.updateById(wmDaDrugEnt);
         } else if (deptIds.getLevel() == 3 || deptIds.getLevel() == 4) {
-            deptIds.setName(wmDaAgent.getEntName());
+            deptIds.setName(wmDaAgent.getGsmc());
             sysDeptService.updateById(deptIds);
             wmDaDrugEnts = wmDaAgentMapper.updateById(wmDaAgent);
         } else {

hnqz-visual/hnqz-report-biz/src/main/resources/mapper/WmDaDrugEntMapper.xml

@@ -5,173 +5,168 @@
 
 <mapper namespace="com.qunzhixinxi.hnqz.report.mapper.WmDaDrugEntMapper">
 
-	<resultMap id="wmDaDrugEntMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt">
-		<id property="id" column="id"/>
-		<result property="entname" column="entname"/>
-		<result property="entcode" column="entcode"/>
-		<result property="temp1" column="temp1"/>
-		<result property="temp2" column="temp2"/>
-		<result property="temp3" column="temp3"/>
-		<result property="temp4" column="temp4"/>
-		<result property="deptId" column="dept_id"/>
-		<result property="delFlag" column="del_flag"/>
-		<result property="enableFlag" column="enable_flag"/>
-		<result property="tenantId" column="tenant_id"/>
-		<result property="createTime" column="create_time"/>
-		<result property="createUser" column="create_user"/>
-		<result property="updateTime" column="update_time"/>
-		<result property="updateUser" column="update_user"/>
-		<result property="pgqx" column="pgqx"/>
-		<result property="management" column="management"/>
-	</resultMap>
-
-	<!-- 分页查询 -->
-	<select id="selectPage" resultMap="wmDaDrugEntMap">
-		SELECT
-			e.id,
-			e.entname,
-			e.entcode,
-			e.temp1,
-			e.temp2,
-			e.temp3,
-			e.temp4,
-			e.dept_id,
-			e.del_flag,
-			e.enable_flag,
-			e.tenant_id,
-			e.create_time,
-			e.create_user,
-			e.update_time,
-			e.update_user,
-			e.pgqx,
-			e.management,
-			e.subject_type,
-			d.dept_permissions
-		FROM wm_da_drug_ent e LEFT JOIN sys_dept d ON e.dept_id=d.dept_id
-		<where>
-			<if test="query.entname != null and query.entname != ''">
-				AND e.entname LIKE CONCAT('%', #{query.entname, jdbcType=VARCHAR}, '%')
-			</if>
-			<if test="query.entcode != null and query.entcode != ''">
-				AND e.entcode = #{query.entcode, jdbcType=VARCHAR}
-			</if>
-		</where>
-		ORDER BY e.create_time DESC
-	</select>
-
-	<select id="selectByDrugId" resultType="java.lang.Integer" parameterType="java.util.HashMap">
-		select o.entname,d.gsmc
-		from wm_relation r
-		left join  wm_da_drug_ent o on r.up_id=o.id
-		left join  wm_da_agent d on r.up_id=d.id
-		where r.up_id = #{upId,jdbcType=INTEGER}
-
-	</select>
-
-	<select id="selectEntNameByDrugId" resultMap="wmDaDrugEntMap" parameterType="java.util.HashMap">
-   select
-   id,dept_id,entname
-   from wm_da_drug_ent
-   where
-   id = #{id,jdbcType=VARCHAR}
-</select>
-
-	<select id="selectEntNameByDrugIds" resultMap="wmDaDrugEntMap" parameterType="java.util.HashMap">
-
-			select d.id,d.entname,d.dept_id
-			from wm_da_drug_ent  d
-			left join  wm_relation r on r.up_id=d.id
-			left join  wm_da_agent o on r.down_id=o.id
-			where r.down_id = #{downId,jdbcType=INTEGER}
-			UNION
-			select id,gsmc,dept_id from wm_da_agent where id= #{Id,jdbcType=INTEGER}
-	</select>
-	<select id="selectByDeptId" resultMap="wmDaDrugEntMap" parameterType="java.util.HashMap">
-   select
-   *
-   from wm_da_drug_ent
-   where
-   dept_id = #{deptId,jdbcType=VARCHAR}
-</select>
-
-	<select id="selectByUserDeptId" resultType="java.util.HashMap" parameterType="java.lang.Integer">
-   select
-   id,entname as gsmc,entcode as zjNumber,management
-   from wm_da_drug_ent
-   where
-   dept_id = #{deptId,jdbcType=VARCHAR}
-</select>
-	<select id="selectDeptId" resultMap="wmDaDrugEntMap">
-		select
-		*
-		from wm_da_drug_ent
-		where
-		dept_id = #{deptId,jdbcType=INTEGER}
-	</select>
-	<select id="selectDeptId1" resultType="java.util.HashMap">
-		select
-		cast(id as char) as id,entname as name
-		from wm_da_drug_ent
-		where
-		dept_id = #{deptId,jdbcType=VARCHAR}
-	</select>
-	<select id="selectId" resultMap="wmDaDrugEntMap">
-		select
-		*
-		from wm_da_drug_ent
-		where
-		id = #{id,jdbcType=BIGINT}
-	</select>
-
-	<select id="selectEntNameByDeptId" resultMap="wmDaDrugEntMap" parameterType="java.util.HashMap">
-   select
-   id,dept_id,entname
-   from wm_da_drug_ent
-   where
-   dept_id = #{deptId,jdbcType=INTEGER}
-</select>
-
-	<select id="selectEntNameByByDeptIds" resultMap="wmDaDrugEntMap" parameterType="java.util.HashMap">
-
-			select d.id,d.entname,d.dept_id
-			from wm_da_drug_ent  d
-			left join  wm_relation r on r.up_id=d.dept_id
-			left join  wm_da_agent o on r.down_id=o.dept_id
-			where r.down_id = #{downId,jdbcType=INTEGER}
-			UNION
-			select id,gsmc,dept_id from wm_da_agent where dept_id= #{deptId,jdbcType=VARCHAR}
-	</select>
-
-	<select id="getListByCsoDeptId" resultMap="wmDaDrugEntMap" >
-
-			SELECT DISTINCT
-				*
-			FROM
-				wm_da_drug_ent
-			WHERE
-				dept_id IN (
-					SELECT
-						up_id
-					FROM
-						wm_relation
-					WHERE
-						down_id = #{deptId,jdbcType=INTEGER}
-					UNION
-						SELECT
-							up_id
-						FROM
-							wm_relation
-						WHERE
-							down_id IN (
-								SELECT
-									up_id
-								FROM
-									wm_relation
-								WHERE
-									down_id = #{deptId,jdbcType=INTEGER}
-							)
-				)
-	</select>
+    <resultMap id="wmDaDrugEntMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt">
+        <id property="id" column="id"/>
+        <result property="entname" column="entname"/>
+        <result property="entcode" column="entcode"/>
+        <result property="temp1" column="temp1"/>
+        <result property="temp2" column="temp2"/>
+        <result property="temp3" column="temp3"/>
+        <result property="temp4" column="temp4"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="enableFlag" column="enable_flag"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createUser" column="create_user"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateUser" column="update_user"/>
+        <result property="pgqx" column="pgqx"/>
+        <result property="management" column="management"/>
+    </resultMap>
+
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="wmDaDrugEntMap">
+        SELECT
+        e.id,
+        e.entname,
+        e.entcode,
+        e.temp1,
+        e.temp2,
+        e.temp3,
+        e.temp4,
+        e.dept_id,
+        e.del_flag,
+        e.enable_flag,
+        e.tenant_id,
+        e.create_time,
+        e.create_user,
+        e.update_time,
+        e.update_user,
+        e.pgqx,
+        e.management,
+        e.subject_type,
+        d.dept_permissions
+        FROM wm_da_drug_ent e LEFT JOIN sys_dept d ON e.dept_id=d.dept_id
+        <where>
+            <if test="query.entname != null and query.entname != ''">
+                AND e.entname LIKE CONCAT('%', #{query.entname, jdbcType=VARCHAR}, '%')
+            </if>
+            <if test="query.entcode != null and query.entcode != ''">
+                AND e.entcode = #{query.entcode, jdbcType=VARCHAR}
+            </if>
+        </where>
+        ORDER BY e.create_time DESC
+    </select>
+
+    <select id="selectByDrugId" resultType="java.lang.Integer" parameterType="java.util.HashMap">
+        select o.entname,d.gsmc
+        from wm_relation r
+        left join wm_da_drug_ent o on r.up_id=o.id
+        left join wm_da_agent d on r.up_id=d.id
+        where r.up_id = #{upId,jdbcType=INTEGER}
+
+    </select>
+
+    <select id="selectEntNameByDrugId" resultMap="wmDaDrugEntMap" parameterType="java.util.HashMap">
+        select
+        id,
+        dept_id,
+        entname
+        from wm_da_drug_ent
+        where
+        id = #{id,jdbcType=VARCHAR}
+    </select>
+
+    <select id="selectEntNameByDrugIds" resultMap="wmDaDrugEntMap" parameterType="java.util.HashMap">
+
+        select
+        d.id,
+        d.entname,
+        d.dept_id
+        from wm_da_drug_ent d
+        left join wm_relation r on r.up_id=d.id
+        left join wm_da_agent o on r.down_id=o.id
+        where r.down_id = #{downId,jdbcType=INTEGER}
+        UNION
+        select id,gsmc,dept_id from wm_da_agent where id= #{Id,jdbcType=INTEGER}
+    </select>
+    <select id="selectByDeptId" resultMap="wmDaDrugEntMap" parameterType="java.util.HashMap">
+        select
+        *
+        from wm_da_drug_ent
+        where
+        dept_id = #{deptId,jdbcType=VARCHAR}
+    </select>
+
+    <select id="selectByUserDeptId" resultType="java.util.HashMap" parameterType="java.lang.Integer">
+        select
+        id,
+		entname as gsmc,
+        entcode as zjNumber,
+        management
+        from wm_da_drug_ent
+        where
+        dept_id = #{deptId,jdbcType=VARCHAR}
+    </select>
+    <select id="selectDeptId" resultMap="wmDaDrugEntMap">
+        select
+        *
+        from wm_da_drug_ent
+        where
+        dept_id = #{deptId,jdbcType=INTEGER}
+    </select>
+    <select id="selectDeptId1" resultType="java.util.HashMap">
+        select
+        cast(id as char) as id,
+		entname as name
+        from wm_da_drug_ent
+        where
+        dept_id = #{deptId,jdbcType=VARCHAR}
+    </select>
+    <select id="selectId" resultMap="wmDaDrugEntMap">
+        select
+        *
+        from wm_da_drug_ent
+        where
+        id = #{id,jdbcType=BIGINT}
+    </select>
+
+    <select id="selectEntNameByDeptId" resultMap="wmDaDrugEntMap" parameterType="java.util.HashMap">
+        select
+        id,
+		dept_id,
+		entname
+        from wm_da_drug_ent
+        where
+        dept_id = #{deptId,jdbcType=INTEGER}
+    </select>
+
+    <select id="selectEntNameByByDeptIds" resultMap="wmDaDrugEntMap" parameterType="java.util.HashMap">
+
+        select d.id,
+		d.entname,
+		d.dept_id
+        from wm_da_drug_ent d
+        left join wm_relation r on r.up_id=d.dept_id
+        left join wm_da_agent o on r.down_id=o.dept_id
+        where r.down_id = #{downId,jdbcType=INTEGER}
+        UNION
+        select id,gsmc,dept_id from wm_da_agent where dept_id= #{deptId,jdbcType=VARCHAR}
+    </select>
+
+    <select id="getListByCsoDeptId" resultMap="wmDaDrugEntMap">
+
+        SELECT DISTINCT
+        *
+        FROM wm_da_drug_ent
+        WHERE dept_id IN (
+        SELECT up_id FROM wm_relation WHERE down_id = #{deptId,jdbcType=INTEGER}
+        UNION
+        SELECT up_id FROM wm_relation
+        WHERE down_id IN ( SELECT up_id FROM wm_relation WHERE down_id = #{deptId,jdbcType=INTEGER} )
+        )
+    </select>
 
 
 </mapper>