Просмотр исходного кода

feat: dept 和 drug 添加别名

shc 9 месяцев назад
Родитель
Сommit
aab08bc34b

+ 3 - 0
hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/WmDaAgentDTO.java

@@ -20,6 +20,9 @@ public final class WmDaAgentDTO {
     @Data
     public static class OnEntAgentCreate {
 
+        @NotEmpty(message = "简称必填")
+        private String abbr;
+
         /**
          * 所属区域
          */

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

@@ -223,4 +223,10 @@ public class WmDaAgent implements Serializable {
      */
     @TableField(exist = false)
     private Boolean evaluated;
+
+    /**
+     * 简称
+     */
+    @TableField(exist = false)
+    private String abbr;
 }

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

@@ -312,6 +312,7 @@ public class WmDaAgentController {
             wmDaAgent.setDeptId(sysDept.getDeptId());
             wmDaAgent.setTenantId(CommonConstants.TENANT_ID_1);
             wmDaAgent.setAreaCodes(resource.getAreaCodes());
+            wmDaAgent.setAbbr(resource.getAbbr());
             wmDaAgent.setQylx("0");
             wmDaAgent.setUpdateUser(0);
             wmDaAgent.setManagement("1");
@@ -750,6 +751,7 @@ public class WmDaAgentController {
         SysDept sysDept = sysDeptMapper.selectById(wmDaAgent.getDeptId());
         sysDept.setDelFlag(wmDaAgent.getEnableFlag());
         sysDept.setName(wmDaAgent.getGsmc());
+        sysDept.setAbbr(wmDaAgent.getAbbr());
         sysDept.setDeptId(wmDaAgent.getDeptId());
         sysDept.setTaxCode(wmDaAgent.getZjNumber());
         sysDeptMapper.updateByPrimaryKeySelective(sysDept);

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

@@ -149,6 +149,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
                     sysDept.setName(wmDaAgent.getGsmc());
                     sysDept.setTaxCode(wmDaAgent.getZjNumber());
                     sysDept.setLevel(3);
+                    sysDept.setAbbr(wmDaAgent.getAbbr());
                     sysDept.setExpiryDate(queryDept.getExpiryDate());
                     sysDeptService.save(sysDept);
                     wmDaAgent.setDeptId(sysDept.getDeptId());
@@ -183,6 +184,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
                     sysDept.setDeptId(IDUtils.getId());
                     sysDept.setName(wmDaAgent.getGsmc());
                     sysDept.setLevel(4);
+                    sysDept.setAbbr(wmDaAgent.getAbbr());
                     sysDept.setTaxCode(wmDaAgent.getZjNumber());
                     sysDept.setExpiryDate(queryDept.getExpiryDate());
                     sysDeptService.save(sysDept);