Browse Source

日志、编号添加单据名称字段

guq 7 năm trước cách đây
mục cha
commit
708382cf2b

+ 10 - 0
applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/BillCodeSeq.java

@@ -61,6 +61,16 @@ public enum  BillCodeSeq {
         return name;
         return name;
     }
     }
 
 
+    // 根据caller返回名称
+    public static String getName( String caller) {
+        for (BillCodeSeq bill : BillCodeSeq.values()) {
+            if (bill.getCaller().equals(caller)) {
+                return bill.name;
+            }
+        }
+        return null;
+    }
+
     public void setName(String name) {
     public void setName(String name) {
         this.name = name;
         this.name = name;
     }
     }

+ 10 - 0
applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/Maxnumbers.java

@@ -9,6 +9,16 @@ public class Maxnumbers extends CommonBaseEntity{
 
 
     private String mn_rule;
     private String mn_rule;
 
 
+    public String getMn_name() {
+        return mn_name;
+    }
+
+    public void setMn_name(String mn_name) {
+        this.mn_name = mn_name;
+    }
+
+    private String mn_name;
+
     public String getMn_rule() {
     public String getMn_rule() {
         return mn_rule;
         return mn_rule;
     }
     }

+ 10 - 0
applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/Messagelog.java

@@ -14,8 +14,18 @@ public class Messagelog extends CommonBaseEntity{
 
 
     private String ml_caller;
     private String ml_caller;
 
 
+    public String getMl_name() {
+        return ml_name;
+    }
+
+    public void setMl_name(String ml_name) {
+        this.ml_name = ml_name;
+    }
+
     private String ml_man;
     private String ml_man;
 
 
+    private String ml_name;
+
     public Long getMl_keyvalue() {
     public Long getMl_keyvalue() {
         return ml_keyvalue;
         return ml_keyvalue;
     }
     }

+ 2 - 0
applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/impl/MessageLogServiceImpl.java

@@ -6,6 +6,7 @@ import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.mapper.MessagelogMapper;
 import com.usoftchina.saas.commons.mapper.MessagelogMapper;
+import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Messagelog;
 import com.usoftchina.saas.commons.po.Messagelog;
 import com.usoftchina.saas.commons.po.Operation;
 import com.usoftchina.saas.commons.po.Operation;
 import com.usoftchina.saas.commons.service.MessageLogService;
 import com.usoftchina.saas.commons.service.MessageLogService;
@@ -100,6 +101,7 @@ public class MessageLogServiceImpl extends CommonBaseServiceImpl<MessagelogMappe
         String language = "zh_CN";
         String language = "zh_CN";
         Messagelog msg = new Messagelog();
         Messagelog msg = new Messagelog();
         msg.setMl_caller(baseDTO.getName());
         msg.setMl_caller(baseDTO.getName());
+        msg.setMl_name(BillCodeSeq.getName(baseDTO.getName()));
         msg.setMl_content(getLocalMessage(operation.getTitle(), language));
         msg.setMl_content(getLocalMessage(operation.getTitle(), language));
         msg.setMl_result(getLocalMessage(operation.getResult(), language));
         msg.setMl_result(getLocalMessage(operation.getResult(), language));
         msg.setMl_code(baseDTO.getCode());
         msg.setMl_code(baseDTO.getCode());

+ 1 - 0
applications/commons/commons-server/src/main/resources/mapper/MaxnumbersMapper.xml

@@ -6,6 +6,7 @@
     <result column="mn_caller" property="mn_caller" jdbcType="VARCHAR" />
     <result column="mn_caller" property="mn_caller" jdbcType="VARCHAR" />
     <result column="mn_leadcode" property="mn_leadcode" jdbcType="VARCHAR" />
     <result column="mn_leadcode" property="mn_leadcode" jdbcType="VARCHAR" />
     <result column="mn_number" property="mn_number" jdbcType="VARCHAR" />
     <result column="mn_number" property="mn_number" jdbcType="VARCHAR" />
+    <result column="mn_name" property="mn_name" jdbcType="VARCHAR" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="createTime" property="createTime" jdbcType="TIMESTAMP" />
     <result column="createTime" property="createTime" jdbcType="TIMESTAMP" />
     <result column="creatorId" property="creatorId" jdbcType="INTEGER" />
     <result column="creatorId" property="creatorId" jdbcType="INTEGER" />

+ 3 - 2
applications/commons/commons-server/src/main/resources/mapper/MessagelogMapper.xml

@@ -7,6 +7,7 @@
     <result column="ml_content" property="ml_content" jdbcType="VARCHAR" />
     <result column="ml_content" property="ml_content" jdbcType="VARCHAR" />
     <result column="ml_result" property="ml_result" jdbcType="VARCHAR" />
     <result column="ml_result" property="ml_result" jdbcType="VARCHAR" />
     <result column="ml_caller" property="ml_caller" jdbcType="VARCHAR" />
     <result column="ml_caller" property="ml_caller" jdbcType="VARCHAR" />
+    <result column="ml_name" property="ml_name" jdbcType="VARCHAR" />
     <result column="ml_man" property="ml_man" jdbcType="VARCHAR" />
     <result column="ml_man" property="ml_man" jdbcType="VARCHAR" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="createTime" property="createTime" jdbcType="TIMESTAMP" />
     <result column="createTime" property="createTime" jdbcType="TIMESTAMP" />
@@ -111,11 +112,11 @@
     insert into messagelog ( ml_code, ml_content,
     insert into messagelog ( ml_code, ml_content,
       ml_result, ml_caller, ml_man, 
       ml_result, ml_caller, ml_man, 
       companyId, createTime, creatorId, 
       companyId, createTime, creatorId, 
-      updateTime, updaterId,ml_keyvalue)
+      updateTime, updaterId,ml_keyvalue,ml_name)
     values (#{ml_code,jdbcType=VARCHAR}, #{ml_content,jdbcType=VARCHAR},
     values (#{ml_code,jdbcType=VARCHAR}, #{ml_content,jdbcType=VARCHAR},
       #{ml_result,jdbcType=VARCHAR}, #{ml_caller,jdbcType=VARCHAR}, #{ml_man,jdbcType=VARCHAR}, 
       #{ml_result,jdbcType=VARCHAR}, #{ml_caller,jdbcType=VARCHAR}, #{ml_man,jdbcType=VARCHAR}, 
       #{companyId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorId,jdbcType=INTEGER}, 
       #{companyId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorId,jdbcType=INTEGER}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{updaterId,jdbcType=INTEGER},#{ml_keyvalue,jdbcType=INTEGER})
+      #{updateTime,jdbcType=TIMESTAMP}, #{updaterId,jdbcType=INTEGER},#{ml_keyvalue,jdbcType=INTEGER},#{ml_name,jdbcType=VARCHAR})
   </insert>
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.commons.po.Messagelog" >
   <insert id="insertSelective" parameterType="com.usoftchina.saas.commons.po.Messagelog" >
     insert into messagelog
     insert into messagelog