Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

.gitignore

@@ -6,7 +6,8 @@ applications/**/target/
 base-servers/**/target/
 framework/**/target/
 !.mvn/wrapper/maven-wrapper.jar
-
+### VSCODE ###
+.vscode
 ### STS ###
 .apt_generated
 .classpath

README.md

@@ -105,7 +105,10 @@
 
 > 服务
 
-* [eureka](http://192.168.0.181:8500) **账号** admin **密码** select111***
+* [eureka http://192.168.0.181:8500](http://192.168.0.181:8500) **账号** admin **密码** select111***
+* [eureka 本地调试 http://192.168.0.181:8510](http://192.168.0.181:8510) **账号** admin **密码** select111***
+* [gateway http://192.168.0.181:8560](http://192.168.0.181:8560)
+* [gateway 本地调试 http://192.168.0.181:8570](http://192.168.0.181:8570)
 * [admin](http://192.168.0.181:8520) **账号** admin **密码** select111***
 * [zipkin](http://192.168.0.181:8540) **账号** admin **密码** select111***
 

applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/MaxnumberService.java

@@ -4,7 +4,11 @@ import com.usoftchina.saas.base.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-
+/**
+* @Description: 编号接口
+* @Author: guq
+* @Date: 2018/10/20
+*/
 @FeignClient("commons-server")
 public interface MaxnumberService {
     /**
@@ -17,5 +21,13 @@ public interface MaxnumberService {
     @PostMapping("/number/pushMaxnubmer")
     public String pushMaxnubmer(@RequestParam("count") Integer count,@RequestParam("code") String code,
                                 @RequestParam("caller") String caller);
-
+    /**
+    * @Description 获取单号
+    * @Param: [caller, update]
+    * @return: com.usoftchina.saas.base.Result
+    * @Author: guq
+    * @Date: 2018/10/22
+    */
+    @PostMapping("/getMaxnumber")
+    public Result getMaxnumber(@RequestParam("caller") String caller, @RequestParam("update") boolean update);
 }

applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/MessageLogService.java

@@ -0,0 +1,40 @@
+package com.usoftchina.saas.commons.api;
+
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+* @Description: 日志接口
+* @Author: guq
+* @Date: 2018/10/20
+*/
+@FeignClient("commons-server")
+public interface MessageLogService {
+
+    @RequestMapping("/save")
+    public void save(@RequestBody DocBaseDTO baseDTO);
+
+    @RequestMapping("/update")
+    public void update(@RequestBody DocBaseDTO baseDTO);
+
+    @RequestMapping("/delete")
+    public void delete(@RequestBody DocBaseDTO baseDTO);
+
+    @RequestMapping("/deleteDetail")
+    public void deleteDetail(@RequestBody DocBaseDTO baseDTO);
+
+    @RequestMapping("/audit")
+    public void audit(@RequestBody DocBaseDTO baseDTO);
+
+    @RequestMapping("/unAudit")
+    public void unAudit(@RequestBody DocBaseDTO baseDTO);
+
+    @RequestMapping("/close")
+    public void close(@RequestBody DocBaseDTO baseDTO);
+
+    @RequestMapping("/open")
+    public void open(@RequestBody DocBaseDTO baseDTO);
+}

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

@@ -0,0 +1,70 @@
+package com.usoftchina.saas.commons.po;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.util.Date;
+
+public class Messagelog extends CommonBaseEntity{
+
+    private String ml_code;
+
+    private String ml_content;
+
+    private String ml_result;
+
+    private String ml_caller;
+
+    private String ml_man;
+
+    public Long getMl_keyvalue() {
+        return ml_keyvalue;
+    }
+
+    public void setMl_keyvalue(Long ml_keyvalue) {
+        this.ml_keyvalue = ml_keyvalue;
+    }
+
+    private Long ml_keyvalue;
+
+
+    public String getMl_code() {
+        return ml_code;
+    }
+
+    public void setMl_code(String ml_code) {
+        this.ml_code = ml_code == null ? null : ml_code.trim();
+    }
+
+    public String getMl_content() {
+        return ml_content;
+    }
+
+    public void setMl_content(String ml_content) {
+        this.ml_content = ml_content == null ? null : ml_content.trim();
+    }
+
+    public String getMl_result() {
+        return ml_result;
+    }
+
+    public void setMl_result(String ml_result) {
+        this.ml_result = ml_result == null ? null : ml_result.trim();
+    }
+
+    public String getMl_caller() {
+        return ml_caller;
+    }
+
+    public void setMl_caller(String ml_caller) {
+        this.ml_caller = ml_caller == null ? null : ml_caller.trim();
+    }
+
+    public String getMl_man() {
+        return ml_man;
+    }
+
+    public void setMl_man(String ml_man) {
+        this.ml_man = ml_man == null ? null : ml_man.trim();
+    }
+
+}

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/MessagelogExample.java

@@ -0,0 +1,911 @@
+package com.usoftchina.saas.commons.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class MessagelogExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public MessagelogExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andMl_idIsNull() {
+            addCriterion("ml_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_idIsNotNull() {
+            addCriterion("ml_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_idEqualTo(Integer value) {
+            addCriterion("ml_id =", value, "ml_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_idNotEqualTo(Integer value) {
+            addCriterion("ml_id <>", value, "ml_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_idGreaterThan(Integer value) {
+            addCriterion("ml_id >", value, "ml_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_idGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ml_id >=", value, "ml_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_idLessThan(Integer value) {
+            addCriterion("ml_id <", value, "ml_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_idLessThanOrEqualTo(Integer value) {
+            addCriterion("ml_id <=", value, "ml_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_idIn(List<Integer> values) {
+            addCriterion("ml_id in", values, "ml_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_idNotIn(List<Integer> values) {
+            addCriterion("ml_id not in", values, "ml_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_idBetween(Integer value1, Integer value2) {
+            addCriterion("ml_id between", value1, value2, "ml_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_idNotBetween(Integer value1, Integer value2) {
+            addCriterion("ml_id not between", value1, value2, "ml_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_codeIsNull() {
+            addCriterion("ml_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_codeIsNotNull() {
+            addCriterion("ml_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_codeEqualTo(String value) {
+            addCriterion("ml_code =", value, "ml_code");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_codeNotEqualTo(String value) {
+            addCriterion("ml_code <>", value, "ml_code");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_codeGreaterThan(String value) {
+            addCriterion("ml_code >", value, "ml_code");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_codeGreaterThanOrEqualTo(String value) {
+            addCriterion("ml_code >=", value, "ml_code");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_codeLessThan(String value) {
+            addCriterion("ml_code <", value, "ml_code");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_codeLessThanOrEqualTo(String value) {
+            addCriterion("ml_code <=", value, "ml_code");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_codeLike(String value) {
+            addCriterion("ml_code like", value, "ml_code");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_codeNotLike(String value) {
+            addCriterion("ml_code not like", value, "ml_code");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_codeIn(List<String> values) {
+            addCriterion("ml_code in", values, "ml_code");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_codeNotIn(List<String> values) {
+            addCriterion("ml_code not in", values, "ml_code");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_codeBetween(String value1, String value2) {
+            addCriterion("ml_code between", value1, value2, "ml_code");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_codeNotBetween(String value1, String value2) {
+            addCriterion("ml_code not between", value1, value2, "ml_code");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_contentIsNull() {
+            addCriterion("ml_content is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_contentIsNotNull() {
+            addCriterion("ml_content is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_contentEqualTo(String value) {
+            addCriterion("ml_content =", value, "ml_content");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_contentNotEqualTo(String value) {
+            addCriterion("ml_content <>", value, "ml_content");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_contentGreaterThan(String value) {
+            addCriterion("ml_content >", value, "ml_content");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_contentGreaterThanOrEqualTo(String value) {
+            addCriterion("ml_content >=", value, "ml_content");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_contentLessThan(String value) {
+            addCriterion("ml_content <", value, "ml_content");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_contentLessThanOrEqualTo(String value) {
+            addCriterion("ml_content <=", value, "ml_content");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_contentLike(String value) {
+            addCriterion("ml_content like", value, "ml_content");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_contentNotLike(String value) {
+            addCriterion("ml_content not like", value, "ml_content");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_contentIn(List<String> values) {
+            addCriterion("ml_content in", values, "ml_content");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_contentNotIn(List<String> values) {
+            addCriterion("ml_content not in", values, "ml_content");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_contentBetween(String value1, String value2) {
+            addCriterion("ml_content between", value1, value2, "ml_content");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_contentNotBetween(String value1, String value2) {
+            addCriterion("ml_content not between", value1, value2, "ml_content");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_resultIsNull() {
+            addCriterion("ml_result is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_resultIsNotNull() {
+            addCriterion("ml_result is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_resultEqualTo(String value) {
+            addCriterion("ml_result =", value, "ml_result");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_resultNotEqualTo(String value) {
+            addCriterion("ml_result <>", value, "ml_result");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_resultGreaterThan(String value) {
+            addCriterion("ml_result >", value, "ml_result");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_resultGreaterThanOrEqualTo(String value) {
+            addCriterion("ml_result >=", value, "ml_result");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_resultLessThan(String value) {
+            addCriterion("ml_result <", value, "ml_result");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_resultLessThanOrEqualTo(String value) {
+            addCriterion("ml_result <=", value, "ml_result");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_resultLike(String value) {
+            addCriterion("ml_result like", value, "ml_result");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_resultNotLike(String value) {
+            addCriterion("ml_result not like", value, "ml_result");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_resultIn(List<String> values) {
+            addCriterion("ml_result in", values, "ml_result");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_resultNotIn(List<String> values) {
+            addCriterion("ml_result not in", values, "ml_result");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_resultBetween(String value1, String value2) {
+            addCriterion("ml_result between", value1, value2, "ml_result");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_resultNotBetween(String value1, String value2) {
+            addCriterion("ml_result not between", value1, value2, "ml_result");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_callerIsNull() {
+            addCriterion("ml_caller is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_callerIsNotNull() {
+            addCriterion("ml_caller is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_callerEqualTo(String value) {
+            addCriterion("ml_caller =", value, "ml_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_callerNotEqualTo(String value) {
+            addCriterion("ml_caller <>", value, "ml_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_callerGreaterThan(String value) {
+            addCriterion("ml_caller >", value, "ml_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_callerGreaterThanOrEqualTo(String value) {
+            addCriterion("ml_caller >=", value, "ml_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_callerLessThan(String value) {
+            addCriterion("ml_caller <", value, "ml_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_callerLessThanOrEqualTo(String value) {
+            addCriterion("ml_caller <=", value, "ml_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_callerLike(String value) {
+            addCriterion("ml_caller like", value, "ml_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_callerNotLike(String value) {
+            addCriterion("ml_caller not like", value, "ml_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_callerIn(List<String> values) {
+            addCriterion("ml_caller in", values, "ml_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_callerNotIn(List<String> values) {
+            addCriterion("ml_caller not in", values, "ml_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_callerBetween(String value1, String value2) {
+            addCriterion("ml_caller between", value1, value2, "ml_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_callerNotBetween(String value1, String value2) {
+            addCriterion("ml_caller not between", value1, value2, "ml_caller");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_manIsNull() {
+            addCriterion("ml_man is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_manIsNotNull() {
+            addCriterion("ml_man is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_manEqualTo(String value) {
+            addCriterion("ml_man =", value, "ml_man");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_manNotEqualTo(String value) {
+            addCriterion("ml_man <>", value, "ml_man");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_manGreaterThan(String value) {
+            addCriterion("ml_man >", value, "ml_man");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_manGreaterThanOrEqualTo(String value) {
+            addCriterion("ml_man >=", value, "ml_man");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_manLessThan(String value) {
+            addCriterion("ml_man <", value, "ml_man");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_manLessThanOrEqualTo(String value) {
+            addCriterion("ml_man <=", value, "ml_man");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_manLike(String value) {
+            addCriterion("ml_man like", value, "ml_man");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_manNotLike(String value) {
+            addCriterion("ml_man not like", value, "ml_man");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_manIn(List<String> values) {
+            addCriterion("ml_man in", values, "ml_man");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_manNotIn(List<String> values) {
+            addCriterion("ml_man not in", values, "ml_man");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_manBetween(String value1, String value2) {
+            addCriterion("ml_man between", value1, value2, "ml_man");
+            return (Criteria) this;
+        }
+
+        public Criteria andMl_manNotBetween(String value1, String value2) {
+            addCriterion("ml_man not between", value1, value2, "ml_man");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("companyId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("companyId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(Integer value) {
+            addCriterion("companyId =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(Integer value) {
+            addCriterion("companyId <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(Integer value) {
+            addCriterion("companyId >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("companyId >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(Integer value) {
+            addCriterion("companyId <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(Integer value) {
+            addCriterion("companyId <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<Integer> values) {
+            addCriterion("companyId in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<Integer> values) {
+            addCriterion("companyId not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(Integer value1, Integer value2) {
+            addCriterion("companyId between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("companyId not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("createTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("createTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("createTime =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("createTime <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("createTime >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("createTime >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("createTime <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("createTime <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("createTime in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("createTime not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("createTime between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("createTime not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdIsNull() {
+            addCriterion("creatorId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdIsNotNull() {
+            addCriterion("creatorId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdEqualTo(Integer value) {
+            addCriterion("creatorId =", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdNotEqualTo(Integer value) {
+            addCriterion("creatorId <>", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdGreaterThan(Integer value) {
+            addCriterion("creatorId >", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("creatorId >=", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdLessThan(Integer value) {
+            addCriterion("creatorId <", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdLessThanOrEqualTo(Integer value) {
+            addCriterion("creatorId <=", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdIn(List<Integer> values) {
+            addCriterion("creatorId in", values, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdNotIn(List<Integer> values) {
+            addCriterion("creatorId not in", values, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdBetween(Integer value1, Integer value2) {
+            addCriterion("creatorId between", value1, value2, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("creatorId not between", value1, value2, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("updateTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("updateTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("updateTime =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("updateTime <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("updateTime >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("updateTime >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("updateTime <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("updateTime <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("updateTime in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("updateTime not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("updateTime between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("updateTime not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdIsNull() {
+            addCriterion("updaterId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdIsNotNull() {
+            addCriterion("updaterId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdEqualTo(Integer value) {
+            addCriterion("updaterId =", value, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdNotEqualTo(Integer value) {
+            addCriterion("updaterId <>", value, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdGreaterThan(Integer value) {
+            addCriterion("updaterId >", value, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("updaterId >=", value, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdLessThan(Integer value) {
+            addCriterion("updaterId <", value, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdLessThanOrEqualTo(Integer value) {
+            addCriterion("updaterId <=", value, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdIn(List<Integer> values) {
+            addCriterion("updaterId in", values, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdNotIn(List<Integer> values) {
+            addCriterion("updaterId not in", values, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdBetween(Integer value1, Integer value2) {
+            addCriterion("updaterId between", value1, value2, "updaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdaterIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("updaterId not between", value1, value2, "updaterId");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/Operation.java

@@ -0,0 +1,109 @@
+package com.usoftchina.saas.commons.po;
+
+public enum Operation {
+
+    /**
+     * 新增
+     */
+    SAVE("msg.save", "msg.saveSuccess"),
+    /**
+     * 修改
+     */
+    UPDATE("msg.update", "msg.updateSuccess"),
+    /**
+     * 审核
+     */
+    AUDIT("msg.audit", "msg.auditSuccess"),
+    /**
+     * 反审核
+     */
+    RESAUDIT("msg.resAudit", "msg.resAuditSuccess"),
+    /**
+     * 记账
+     */
+    POST("msg.post", "msg.postSuccess"),
+    /**
+     * 反记账
+     */
+    RESPOST("msg.resPost", "msg.resPostSuccess"),
+    /**
+     * 打印
+     */
+    PRINT("msg.print", "msg.printSuccess"),
+    /**
+     * 关闭
+     */
+    CLOSE("msg.close", "msg.closeSuccess"),
+    /**
+     * 删除
+     */
+    DELETE("msg.delete", "msg.deleteSuccess"),
+    /**
+     * 删除明细
+     */
+    DELETEDETAIL("msg.deleteDetail", "msg.deleteDetailSuccess"),
+    /**
+     * 反结案=>已审核
+     */
+    OPEN("msg.resClose", "msg.resCloseSuccess"),
+    /**
+     * 禁用操作
+     */
+    BANNED("msg.banned", "msg.bannedSuccess");
+
+    private final String title;
+    private final String result;
+
+    private Operation(String title, String result) {
+        this.title = title;
+        this.result = result;
+    }
+
+    /**
+     * 操作描述
+     *
+     * @param
+     * @return
+     */
+    public String getTitle() {
+        return this.title;
+    }
+
+    /**
+     * 操作描述
+     *
+     * @param
+     * @return
+     */
+    public String getResult() {
+        return this.result;
+    }
+
+  /*  *//**
+     * 操作结果
+     *
+     * @param
+     * @return
+     *//*
+    public String getResult() {
+        return getResult(null);
+    }
+
+    *//**
+     * 操作结果
+     *
+     * @param language
+     * @return
+     *//*
+    public String getResult(String language) {
+        return getLocalMessage(this.result, language);
+    }
+
+
+    private String getLocalMessage(String msg, String language) {
+
+        return null;
+    }*/
+
+
+}

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/controller/MessageLogController.java

@@ -0,0 +1,58 @@
+package com.usoftchina.saas.commons.controller;
+
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import com.usoftchina.saas.commons.service.MessageLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author: guq
+ * @create: 2018-10-20 11:46
+ **/
+@RequestMapping("/messagelog")
+public class MessageLogController {
+
+    @Autowired
+    private MessageLogService messageLogService;
+
+    @RequestMapping("/save")
+    public void save(@RequestBody DocBaseDTO baseDTO) {
+        messageLogService.save(baseDTO);
+    }
+
+    @RequestMapping("/update")
+    public void update(@RequestBody DocBaseDTO baseDTO) {
+        messageLogService.update(baseDTO);
+    }
+
+    @RequestMapping("/delete")
+    public void delete(@RequestBody DocBaseDTO baseDTO) {
+        messageLogService.delete(baseDTO);
+    }
+
+    @RequestMapping("/deleteDetail")
+    public void deleteDetail(@RequestBody DocBaseDTO baseDTO) {
+        messageLogService.deleteDetail(baseDTO);
+    }
+
+    @RequestMapping("/audit")
+    public void audit(@RequestBody DocBaseDTO baseDTO) {
+        messageLogService.audit(baseDTO);
+    }
+
+    @RequestMapping("/unAudit")
+    public void unAudit(@RequestBody DocBaseDTO baseDTO) {
+        messageLogService.unAudit(baseDTO);
+    }
+
+    @RequestMapping("/close")
+    public void close(@RequestBody DocBaseDTO baseDTO) {
+        messageLogService.close(baseDTO);
+    }
+
+    @RequestMapping("/open")
+    public void open(@RequestBody DocBaseDTO baseDTO) {
+        messageLogService.open(baseDTO);
+    }
+}

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/mapper/MessagelogMapper.java

@@ -0,0 +1,31 @@
+package com.usoftchina.saas.commons.mapper;
+
+import com.usoftchina.saas.base.mapper.CommonBaseMapper;
+import com.usoftchina.saas.commons.po.Messagelog;
+import com.usoftchina.saas.commons.po.MessagelogExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface MessagelogMapper extends CommonBaseMapper<Messagelog>{
+    int countByExample(MessagelogExample example);
+
+    int deleteByExample(MessagelogExample example);
+
+    int deleteByPrimaryKey(Integer ml_id);
+
+    int insert(Messagelog record);
+
+    int insertSelective(Messagelog record);
+
+    List<Messagelog> selectByExample(MessagelogExample example);
+
+    Messagelog selectByPrimaryKey(Integer ml_id);
+
+    int updateByExampleSelective(@Param("record") Messagelog record, @Param("example") MessagelogExample example);
+
+    int updateByExample(@Param("record") Messagelog record, @Param("example") MessagelogExample example);
+
+    int updateByPrimaryKeySelective(Messagelog record);
+
+    int updateByPrimaryKey(Messagelog record);
+}

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/MessageLogService.java

@@ -0,0 +1,24 @@
+package com.usoftchina.saas.commons.service;
+
+import com.usoftchina.saas.base.service.CommonBaseService;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import com.usoftchina.saas.commons.mapper.MessagelogMapper;
+import com.usoftchina.saas.commons.po.Messagelog;
+
+public interface MessageLogService extends CommonBaseService<MessagelogMapper, Messagelog>{
+    void save(DocBaseDTO baseDTO);
+
+    void update(DocBaseDTO baseDTO);
+
+    void delete(DocBaseDTO baseDTO);
+
+    void deleteDetail(DocBaseDTO baseDTO);
+
+    void audit(DocBaseDTO baseDTO);
+
+    void unAudit(DocBaseDTO baseDTO);
+
+    void close(DocBaseDTO baseDTO);
+
+    void open(DocBaseDTO baseDTO);
+}

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

@@ -0,0 +1,84 @@
+package com.usoftchina.saas.commons.service.impl;
+
+import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import com.usoftchina.saas.commons.mapper.MessagelogMapper;
+import com.usoftchina.saas.commons.po.Messagelog;
+import com.usoftchina.saas.commons.po.Operation;
+import com.usoftchina.saas.commons.service.MessageLogService;
+import com.usoftchina.saas.context.BaseContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.MessageSource;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.Locale;
+
+/**
+ * @author: guq
+ * @create: 2018-10-20 13:44
+ **/
+@Service
+public class MessageLogServiceImpl extends CommonBaseServiceImpl<MessagelogMapper, Messagelog> implements MessageLogService {
+
+    @Autowired
+    private MessageSource messageSource;
+
+    @Override
+    public void save(DocBaseDTO baseDTO) {
+        log(Operation.SAVE, baseDTO);
+    }
+
+    @Override
+    public void update(DocBaseDTO baseDTO) {
+        log(Operation.UPDATE, baseDTO);
+    }
+
+    @Override
+    public void delete(DocBaseDTO baseDTO) {
+        log(Operation.DELETE, baseDTO);
+    }
+
+    @Override
+    public void deleteDetail(DocBaseDTO baseDTO) {
+        log(Operation.DELETEDETAIL, baseDTO);
+    }
+
+    @Override
+    public void audit(DocBaseDTO baseDTO) {
+        log(Operation.AUDIT, baseDTO);
+    }
+
+    @Override
+    public void unAudit(DocBaseDTO baseDTO) {
+        log(Operation.RESAUDIT, baseDTO);
+    }
+
+    @Override
+    public void close(DocBaseDTO baseDTO) {
+        log(Operation.CLOSE, baseDTO);
+    }
+
+    @Override
+    public void open(DocBaseDTO baseDTO) {
+        log(Operation.OPEN, baseDTO);
+    }
+
+    private void log(Operation operation, DocBaseDTO baseDTO) {
+        String language = "zh_CN";
+        Messagelog msg = new Messagelog();
+        msg.setMl_caller(baseDTO.getName());
+        msg.setMl_content(getLocalMessage(operation.getTitle(), language));
+        msg.setMl_result(getLocalMessage(operation.getResult(), language));
+        msg.setMl_code(baseDTO.getCode());
+        msg.setCompanyId(BaseContextHolder.getCompanyId());
+        msg.setCreateTime(new Date());
+        msg.setCreatorId(BaseContextHolder.getUserId());
+        msg.setMl_keyvalue(baseDTO.getId());
+        getMapper().insert(msg);
+    }
+
+    private String getLocalMessage(String msg, String language) {
+       return messageSource.getMessage(msg, null, Locale.CHINA);
+    }
+}

applications/commons/commons-server/src/main/resources/application.yml

@@ -18,6 +18,7 @@ spring:
       connection-timeout: 30000
   messages:
     basename: i18n/messages
+    encoding: UTF-8
   rabbitmq:
     host: 192.168.0.176
     port: 5672

applications/commons/commons-server/src/main/resources/i18n/messages_zh_CN.properties

@@ -0,0 +1,117 @@
+#MessageLog
+msg.detail=  \u660e\u7ec6\u884c:
+msg.save=\u4fdd\u5b58\u64cd\u4f5c 
+msg.delete=\u5220\u9664\u64cd\u4f5c
+msg.update=\u4fee\u6539\u64cd\u4f5c
+msg.commit=\u63d0\u4ea4\u64cd\u4f5c
+msg.resCommit=\u53cd\u63d0\u4ea4\u64cd\u4f5c
+msg.reply=\u56de\u590d\u5355\u636e
+msg.audit=\u5ba1\u6838\u64cd\u4f5c
+msg.resAudit=\u53cd\u5ba1\u6838\u64cd\u4f5c
+msg.resHung=\u89e3\u6302\u64cd\u4f5c
+msg.check=\u6838\u5bf9\u5355\u636e
+msg.print=\u6253\u5370\u5355\u636e
+msg.banned=\u7981\u7528\u64cd\u4f5c
+msg.resBanned=\u53cd\u7981\u7528\u64cd\u4f5c
+msg.hung=\u6302\u8d77\u64cd\u4f5c
+msg.qty.out=  \u8f6c\u51fa\u6570\u91cf
+msg.qty.in=  \u8f6c\u5165\u6570\u91cf
+msg.modify=\u66f4\u65b0\u6570\u636e
+msg.modifyDetail=\u66f4\u65b0\u660e\u7ec6\u6570\u636e
+msg.printMT=\u591a\u6b21\u6253\u5370
+msg.printMTSuccess=\u591a\u6b21\u6253\u5370\u6210\u529f
+msg.saveSuccess=\u4fdd\u5b58\u6210\u529f
+msg.deleteSuccess=\u5220\u9664\u6210\u529f
+msg.updateSuccess=\u4fee\u6539\u6210\u529f
+msg.commitSuccess=\u63d0\u4ea4\u6210\u529f
+msg.resCommitSuccess=\u53cd\u63d0\u4ea4\u6210\u529f
+msg.replySuccess=\u56de\u590d\u6210\u529f
+msg.auditSuccess=\u5ba1\u6838\u6210\u529f
+msg.resAuditSuccess=\u53cd\u5ba1\u6838\u6210\u529f
+msg.hungSuccess=\u6302\u8d77\u6210\u529f
+msg.resHungSuccess=\u89e3\u6302\u6210\u529f
+msg.checkSuccess=\u6838\u5bf9\u6210\u529f
+msg.printSuccess=\u6253\u5370\u6210\u529f
+msg.bannedSuccess=\u7981\u7528\u6210\u529f
+msg.resBannedSuccess=\u53cd\u7981\u7528\u6210\u529f
+msg.modifySuccess=\u6570\u636e\u66f4\u65b0\u6210\u529f
+msg.modifyDetailSuccess=\u66f4\u65b0\u660e\u7ec6\u6570\u636e\u6210\u529f
+msg.post=\u8fc7\u8d26\u64cd\u4f5c
+msg.openMrp=\u6253\u5f00Mrp
+msg.openMrpSuccess=\u6253\u5f00Mrp\u6210\u529f\uff01
+msg.closeMrp=\u5173\u95edMrp
+msg.closeMrpSuccess=\u5173\u95edMrp\u6210\u529f\uff01
+msg.resPost=\u53cd\u8fc7\u8d26\u64cd\u4f5c
+msg.postSuccess=\u8fc7\u8d26\u6210\u529f
+msg.resPostSuccess=\u53cd\u8fc7\u8d26\u6210\u529f
+msg.account=\u8bb0\u8d26\u64cd\u4f5c
+msg.resAccount=\u53cd\u8bb0\u8d26\u64cd\u4f5c
+msg.accountSuccess=\u8bb0\u8d26\u6210\u529f
+msg.resAccountSuccess=\u53d6\u6d88\u8bb0\u8d26\u6210\u529f
+msg.freeze=\u51bb\u7ed3\u64cd\u4f5c
+msg.freezeSuccess=\u51bb\u7ed3\u6210\u529f
+msg.resFreeze=\u53d6\u6d88\u51bb\u7ed3\u64cd\u4f5c
+msg.resFreezeSuccess=\u53d6\u6d88\u51bb\u7ed3\u6210\u529f
+msg.resStart=\u91cd\u542f\u64cd\u4f5c
+msg.resStartSuccess=\u91cd\u542f\u6210\u529f
+msg.close=\u7ed3\u6848\u64cd\u4f5c
+msg.closeSuccess=\u7ed3\u6848\u6210\u529f
+msg.resClose=\u53d6\u6d88\u7ed3\u6848\u64cd\u4f5c
+msg.resCloseSuccess=\u53d6\u6d88\u7ed3\u6848\u6210\u529f
+msg.turnPurchase=\u8f6c\u91c7\u8d2d\u5355\u64cd\u4f5c
+msg.turnMake=\u8f6c\u5236\u9020\u5355\u64cd\u4f5c
+msg.turnOutSource=\u8f6c\u59d4\u5916\u5355\u64cd\u4f5c
+msg.turnCustomer=\u8f6c\u5ba2\u6237\u64cd\u4f5c
+msg.turnFKCustomer=\u5b8c\u5584\u98ce\u63a7\u8d44\u6599
+msg.turnFKSuccess=\u5df2\u5b8c\u5584\u98ce\u63a7\u8d44\u6599
+msg.turnAcceptNotify=\u8f6c\u6536\u6599\u901a\u77e5\u5355\u64cd\u4f5c
+msg.turnProdIO\!SaleReturn=\u8f6c\u9500\u552e\u9000\u8d27\u64cd\u4f5c
+msg.turnVerifyApply=\u8f6c\u6536\u6599\u5355
+msg.turnSuccess=\u8f6c\u5355\u6210\u529f
+msg.submit=\u63d0\u4ea4\u64cd\u4f5c
+msg.submitSuccess=\u63d0\u4ea4\u6210\u529f
+msg.VerifyApplyDetailOQC=\u8f6c\u5ba2\u6237\u9a8c\u8d27\u5355\u6210\u529f
+msg.resSubmit=\u53cd\u63d0\u4ea4\u64cd\u4f5c
+msg.resSubmitSuccess=\u53cd\u63d0\u4ea4\u6210\u529f
+msg.turnVendor=\u8f6c\u4f9b\u5e94\u5546\u64cd\u4f5c
+msg.turnPayBalance=\u8f6c\u4ed8\u6b3e\u5355\u64cd\u4f5c
+msg.turnRecBalance=\u8f6c\u6536\u6b3e\u5355\u64cd\u4f5c
+msg.turnSale=\u8f6c\u9500\u552e\u5355\u64cd\u4f5c
+msg.turnPurcPrice=\u8f6c\u6838\u4ef7\u5355
+msg.turnRepairOrder=\u8f6c\u6d3e\u5de5\u5355
+msg.turnProdIN=\u8f6c\u51fa\u8d27\u5355\u64cd\u4f5c
+msg.end=\u7ed3\u6848\u64cd\u4f5c
+msg.endSuccess=\u7ed3\u6848\u6210\u529f
+msg.resEnd=\u53cd\u7ed3\u6848\u64cd\u4f5c
+msg.nullify=\u4f5c\u5e9f\u64cd\u4f5c
+msg.nullifySuccess=\u4f5c\u5e9f\u6210\u529f
+msg.turnRecruitment=\u8f6c\u62db\u8058\u8ba1\u5212
+msg.turnRecruitmentsuccess=\u8f6c\u62db\u8058\u8ba1\u5212\u6210\u529f
+msg.resEndSuccess=\u53cd\u7ed3\u6848\u6210\u529f
+msg.turnARBill=\u5f00\u7968\u4f5c\u4e1a
+msg.turnNotify=\u8f6c\u901a\u77e5\u5355\u64cd\u4f5c
+msg.turnStorage=\u8f6c\u5165\u5e93
+msg.turnProdIO=\u8f6c\u51fa\u5e93\u5355\u64cd\u4f5c
+msg.turnProdIO\!OtherOut=\u8f6c\u5176\u5b83\u51fa\u5e93\u5355\u64cd\u4f5c
+msg.turnProdIO\!OtherPurcOut=\u8f6c\u5176\u5b83\u91c7\u8d2d\u51fa\u5e93\u5355
+msg.turnSendNotify=\u8f6c\u53d1\u8d27\u901a\u77e5\u5355\u64cd\u4f5c
+msg.turnSaleReturn=\u8f6c\u9500\u552e\u9000\u8d27\u5355
+msg.approve=\u6279\u51c6\u64cd\u4f5c
+msg.approveSuccess=\u6279\u51c6\u6210\u529f
+msg.resApprove=\u53cd\u6279\u51c6\u64cd\u4f5c
+msg.resApproveSuccess=\u53cd\u6279\u51c6\u6210\u529f
+msg.turnEmployee=\u8f6c\u8bd5\u7528\u4eba\u5458
+msg.turnEmployeeSuccess=\u8f6c\u8bd5\u7528\u4eba\u5458\u6210\u529f
+msg.turnBuglist=\u8f6cbuglist\u6210\u529f
+msg.changeSeller=\u4e1a\u52a1\u5458\u8f6c\u79fb\u64cd\u4f5c 
+msg.changeSellerSuccess=\u4e1a\u52a1\u5458\u8f6c\u79fb\u6210\u529f
+msg.confirm=\u786e\u8ba4
+msg.confirmSuccess=\u786e\u8ba4\u6210\u529f
+msg.resConfirm=\u53cd\u786e\u8ba4\u64cd\u4f5c
+msg.resConfirmSuccess=\u53cd\u786e\u8ba4\u6210\u529f
+msg.Copy=\u590d\u5236\u64cd\u4f5c
+msg.CopySuccess=\u590d\u5236\u6210\u529f,\u6765\u6e90\u5355\u53f7\uff1a
+msg.getBill=\u83b7\u53d6\u53d1\u7968\u660e\u7ec6
+msg.getARBill=\u83b7\u53d6\u5e94\u6536\u53d1\u7968
+msg.getAPBill=\u83b7\u53d6\u5e94\u4ed8\u53d1\u7968
+msg.getSuccess=\u83b7\u53d6\u6210\u529f

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

@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.commons.mapper.MessagelogMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.commons.po.Messagelog" >
+    <id column="ml_id" property="id" jdbcType="INTEGER" />
+    <result column="ml_code" property="ml_code" jdbcType="VARCHAR" />
+    <result column="ml_content" property="ml_content" jdbcType="VARCHAR" />
+    <result column="ml_result" property="ml_result" jdbcType="VARCHAR" />
+    <result column="ml_caller" property="ml_caller" jdbcType="VARCHAR" />
+    <result column="ml_man" property="ml_man" jdbcType="VARCHAR" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
+    <result column="createTime" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="creatorId" property="creatorId" jdbcType="INTEGER" />
+    <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
+    <result column="ml_keyvalue" property="ml_keyvalue" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    ml_id, ml_code, ml_content, ml_result, ml_caller, ml_man, companyId, createTime, 
+    creatorId, updateTime, updaterId
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.usoftchina.saas.commons.po.MessagelogExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from messagelog
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from messagelog
+    where ml_id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from messagelog
+    where ml_id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.usoftchina.saas.commons.po.MessagelogExample" >
+    delete from messagelog
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.usoftchina.saas.commons.po.Messagelog" >
+    insert into messagelog ( ml_code, ml_content,
+      ml_result, ml_caller, ml_man, 
+      companyId, createTime, creatorId, 
+      updateTime, updaterId,ml_keyvalue)
+    values (#{ml_code,jdbcType=VARCHAR}, #{ml_content,jdbcType=VARCHAR},
+      #{ml_result,jdbcType=VARCHAR}, #{ml_caller,jdbcType=VARCHAR}, #{ml_man,jdbcType=VARCHAR}, 
+      #{companyId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorId,jdbcType=INTEGER}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{updaterId,jdbcType=INTEGER},#{ml_keyvalue,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.commons.po.Messagelog" >
+    insert into messagelog
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        ml_id,
+      </if>
+      <if test="ml_code != null" >
+        ml_code,
+      </if>
+      <if test="ml_content != null" >
+        ml_content,
+      </if>
+      <if test="ml_result != null" >
+        ml_result,
+      </if>
+      <if test="ml_caller != null" >
+        ml_caller,
+      </if>
+      <if test="ml_man != null" >
+        ml_man,
+      </if>
+      <if test="companyId != null" >
+        companyId,
+      </if>
+      <if test="createTime != null" >
+        createTime,
+      </if>
+      <if test="creatorId != null" >
+        creatorId,
+      </if>
+      <if test="updateTime != null" >
+        updateTime,
+      </if>
+      <if test="updaterId != null" >
+        updaterId,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="ml_code != null" >
+        #{ml_code,jdbcType=VARCHAR},
+      </if>
+      <if test="ml_content != null" >
+        #{ml_content,jdbcType=VARCHAR},
+      </if>
+      <if test="ml_result != null" >
+        #{ml_result,jdbcType=VARCHAR},
+      </if>
+      <if test="ml_caller != null" >
+        #{ml_caller,jdbcType=VARCHAR},
+      </if>
+      <if test="ml_man != null" >
+        #{ml_man,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorId != null" >
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updaterId != null" >
+        #{updaterId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.usoftchina.saas.commons.po.MessagelogExample" resultType="java.lang.Integer" >
+    select count(*) from messagelog
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update messagelog
+    <set >
+      <if test="record.id != null" >
+        ml_id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.ml_code != null" >
+        ml_code = #{record.ml_code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ml_content != null" >
+        ml_content = #{record.ml_content,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ml_result != null" >
+        ml_result = #{record.ml_result,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ml_caller != null" >
+        ml_caller = #{record.ml_caller,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ml_man != null" >
+        ml_man = #{record.ml_man,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyId != null" >
+        companyId = #{record.companyId,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null" >
+        createTime = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.creatorId != null" >
+        creatorId = #{record.creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="record.updateTime != null" >
+        updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updaterId != null" >
+        updaterId = #{record.updaterId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update messagelog
+    set ml_id = #{record.id,jdbcType=INTEGER},
+      ml_code = #{record.ml_code,jdbcType=VARCHAR},
+      ml_content = #{record.ml_content,jdbcType=VARCHAR},
+      ml_result = #{record.ml_result,jdbcType=VARCHAR},
+      ml_caller = #{record.ml_caller,jdbcType=VARCHAR},
+      ml_man = #{record.ml_man,jdbcType=VARCHAR},
+      companyId = #{record.companyId,jdbcType=INTEGER},
+      createTime = #{record.createTime,jdbcType=TIMESTAMP},
+      creatorId = #{record.creatorId,jdbcType=INTEGER},
+      updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
+      updaterId = #{record.updaterId,jdbcType=INTEGER}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.commons.po.Messagelog" >
+    update messagelog
+    <set >
+      <if test="ml_code != null" >
+        ml_code = #{ml_code,jdbcType=VARCHAR},
+      </if>
+      <if test="ml_content != null" >
+        ml_content = #{ml_content,jdbcType=VARCHAR},
+      </if>
+      <if test="ml_result != null" >
+        ml_result = #{ml_result,jdbcType=VARCHAR},
+      </if>
+      <if test="ml_caller != null" >
+        ml_caller = #{ml_caller,jdbcType=VARCHAR},
+      </if>
+      <if test="ml_man != null" >
+        ml_man = #{ml_man,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        companyId = #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        createTime = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorId != null" >
+        creatorId = #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null" >
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updaterId != null" >
+        updaterId = #{updaterId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where ml_id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.commons.po.Messagelog" >
+    update messagelog
+    set ml_code = #{ml_code,jdbcType=VARCHAR},
+      ml_content = #{ml_content,jdbcType=VARCHAR},
+      ml_result = #{ml_result,jdbcType=VARCHAR},
+      ml_caller = #{ml_caller,jdbcType=VARCHAR},
+      ml_man = #{ml_man,jdbcType=VARCHAR},
+      companyId = #{companyId,jdbcType=INTEGER},
+      createTime = #{createTime,jdbcType=TIMESTAMP},
+      creatorId = #{creatorId,jdbcType=INTEGER},
+      updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      updaterId = #{updaterId,jdbcType=INTEGER}
+    where ml_id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

applications/money/money-server/pom.xml

@@ -11,20 +11,16 @@
 
     <artifactId>money-server</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>com.usoftchina.saas</groupId>
-            <artifactId>auth-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.usoftchina.saas</groupId>
-            <artifactId>server-starter</artifactId>
-        </dependency>
 
         <!--test-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
 
         <!-- db -->
         <dependency>
@@ -62,6 +58,16 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>5.0.8.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>core</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -77,4 +83,6 @@
         </plugins>
     </build>
 
+
+
 </project>

applications/money/money-server/src/main/java/com/usoftchina/saas/money/MoneyApplicatiion.java

@@ -1,8 +1,10 @@
 package com.usoftchina.saas.money;
 
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+//import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 /**
@@ -10,11 +12,13 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
  * @create: 2018-10-20 11:29
  **/
 @SpringBootApplication
-@EnableEurekaClient
+//@EnableEurekaClient
 @EnableTransactionManagement
+@EnableFeignClients("com.usoftchina.saas")
+//@EnableAuthClient
 @MapperScan("com.usoftchina.saas.money.mapper")
 public class MoneyApplicatiion {
     public static void main(String[] args) {
-
+        SpringApplication.run(MoneyApplicatiion.class, args);
     }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/BanksubledgerMapper.java

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.money.mapper;
 
 
+import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.money.po.Banksubledger;
 import com.usoftchina.saas.money.po.BanksubledgerExample;
 import org.apache.ibatis.annotations.Param;
@@ -11,7 +12,7 @@ import java.util.List;
  * @author hx
  * @createtime 2018-10-19 15:57
  */
-public interface BanksubledgerMapper {
+public interface BanksubledgerMapper extends CommonBaseMapper<Banksubledger> {
     int countByExample(BanksubledgerExample example);
 
     int deleteByExample(BanksubledgerExample example);

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/PaybalanceMapper.java

@@ -1,11 +1,12 @@
 package com.usoftchina.saas.money.mapper;
 
+import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.money.po.Paybalance;
 import com.usoftchina.saas.money.po.PaybalanceExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
-public interface PaybalanceMapper {
+public interface PaybalanceMapper extends CommonBaseMapper<Paybalance> {
     int countByExample(PaybalanceExample example);
 
     int deleteByExample(PaybalanceExample example);

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/RecbalanceMapper.java

@@ -1,15 +1,17 @@
 package com.usoftchina.saas.money.mapper;
 
+import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.money.po.Recbalance;
 import com.usoftchina.saas.money.po.RecbalanceExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
+
 /**
  * @author hx
  * @createtime 2018-10-19 15:58
  */
-public interface RecbalanceMapper {
+public interface RecbalanceMapper extends CommonBaseMapper<Recbalance> {
     int countByExample(RecbalanceExample example);
 
     int deleteByExample(RecbalanceExample example);

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/RecbalancedetMapper.java

@@ -1,11 +1,12 @@
 package com.usoftchina.saas.money.mapper;
 
+import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.money.po.Recbalancedet;
 import com.usoftchina.saas.money.po.RecbalancedetExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
-public interface RecbalancedetMapper {
+public interface RecbalancedetMapper extends CommonBaseMapper<Recbalancedet> {
     int countByExample(RecbalancedetExample example);
 
     int deleteByExample(RecbalancedetExample example);

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Banksubledger.java

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.money.po;
 
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -9,6 +10,7 @@ import java.util.Date;
  * @author hx
  * @createtime 2018-10-19 15:58
  */
+@Data
 public class Banksubledger extends CommonBaseEntity implements Serializable {
     private Integer bl_id;  //ID
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Paybalance.java

@@ -1,5 +1,9 @@
 package com.usoftchina.saas.money.po;
 
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -7,7 +11,8 @@ import java.util.Date;
  * @author hx
  * @createtime 2018-10-19 16:03
  */
-public class Paybalance {
+@Data
+public class Paybalance extends CommonBaseEntity implements Serializable {
     private Integer pb_id;
 
     private String pb_code;
@@ -46,12 +51,6 @@ public class Paybalance {
 
     private String pb_remark;
 
-    private Integer companyid;
-
-    private Integer updaterId;
-
-    private Date updatedate;
-
     private String pb_text1;
 
     private String pb_text2;
@@ -214,30 +213,6 @@ public class Paybalance {
         this.pb_remark = pb_remark == null ? null : pb_remark.trim();
     }
 
-    public Integer getCompanyid() {
-        return companyid;
-    }
-
-    public void setCompanyid(Integer companyid) {
-        this.companyid = companyid;
-    }
-
-    public Integer getUpdaterId() {
-        return updaterId;
-    }
-
-    public void setUpdaterId(Integer updaterId) {
-        this.updaterId = updaterId;
-    }
-
-    public Date getUpdatedate() {
-        return updatedate;
-    }
-
-    public void setUpdatedate(Date updatedate) {
-        this.updatedate = updatedate;
-    }
-
     public String getPb_text1() {
         return pb_text1;
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Recbalance.java

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.money.po;
 
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -9,6 +10,7 @@ import java.util.Date;
  * @author hx
  * @createtime 2018-10-19 15:59
  */
+@Data
 public class Recbalance extends CommonBaseEntity implements Serializable {
     private Integer rb_id;
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Recbalancedet.java

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.money.po;
 
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -9,6 +10,7 @@ import java.util.Date;
  * @author hx
  * @createtime 2018-10-19 16:03
  */
+@Data
 public class Recbalancedet extends CommonBaseEntity implements Serializable{
     private Integer rd_id;
 
@@ -32,12 +34,6 @@ public class Recbalancedet extends CommonBaseEntity implements Serializable{
 
     private String rd_remark;
 
-    private Integer companyid;
-
-    private Integer updaterId;
-
-    private Date updatedate;
-
     private String rd_text1;
 
     private String rd_text2;
@@ -136,30 +132,6 @@ public class Recbalancedet extends CommonBaseEntity implements Serializable{
         this.rd_remark = rd_remark == null ? null : rd_remark.trim();
     }
 
-    public Integer getCompanyid() {
-        return companyid;
-    }
-
-    public void setCompanyid(Integer companyid) {
-        this.companyid = companyid;
-    }
-
-    public Integer getUpdaterId() {
-        return updaterId;
-    }
-
-    public void setUpdaterId(Integer updaterId) {
-        this.updaterId = updaterId;
-    }
-
-    public Date getUpdatedate() {
-        return updatedate;
-    }
-
-    public void setUpdatedate(Date updatedate) {
-        this.updatedate = updatedate;
-    }
-
     public String getRd_text1() {
         return rd_text1;
     }

applications/money/money-server/src/main/resources/mapper/PaybalanceMapper.xml

@@ -557,560 +557,5 @@
       pb_text5 = #{pb_text5,jdbcType=VARCHAR}
     where pb_id = #{pb_id,jdbcType=INTEGER}
   </update>
-  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Paybalance">
-    <id column="pb_id" jdbcType="INTEGER" property="pb_id" />
-    <result column="pb_code" jdbcType="VARCHAR" property="pb_code" />
-    <result column="pb_kind" jdbcType="VARCHAR" property="pb_kind" />
-    <result column="pb_date" jdbcType="TIMESTAMP" property="pb_date" />
-    <result column="pb_vendid" jdbcType="INTEGER" property="pb_vendid" />
-    <result column="pb_vendcode" jdbcType="VARCHAR" property="pb_vendcode" />
-    <result column="pb_vendname" jdbcType="VARCHAR" property="pb_vendname" />
-    <result column="pb_manname" jdbcType="VARCHAR" property="pb_manname" />
-    <result column="pb_pdamount" jdbcType="DOUBLE" property="pb_pdamount" />
-    <result column="pb_pbdamount" jdbcType="DOUBLE" property="pb_pbdamount" />
-    <result column="pb_preamount" jdbcType="DOUBLE" property="pb_preamount" />
-    <result column="pb_discounts" jdbcType="DOUBLE" property="pb_discounts" />
-    <result column="pb_havebalance" jdbcType="DOUBLE" property="pb_havebalance" />
-    <result column="pb_recorderid" jdbcType="INTEGER" property="pb_recorderid" />
-    <result column="pb_recorder" jdbcType="VARCHAR" property="pb_recorder" />
-    <result column="pb_recorddate" jdbcType="TIMESTAMP" property="pb_recorddate" />
-    <result column="pb_status" jdbcType="INTEGER" property="pb_status" />
-    <result column="pb_statuscode" jdbcType="DECIMAL" property="pb_statuscode" />
-    <result column="pb_remark" jdbcType="VARCHAR" property="pb_remark" />
-    <result column="companyid" jdbcType="INTEGER" property="companyid" />
-    <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
-    <result column="updatedate" jdbcType="TIMESTAMP" property="updatedate" />
-    <result column="pb_text1" jdbcType="VARCHAR" property="pb_text1" />
-    <result column="pb_text2" jdbcType="VARCHAR" property="pb_text2" />
-    <result column="pb_text3" jdbcType="VARCHAR" property="pb_text3" />
-    <result column="pb_text4" jdbcType="VARCHAR" property="pb_text4" />
-    <result column="pb_text5" jdbcType="VARCHAR" property="pb_text5" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    pb_id, pb_code, pb_kind, pb_date, pb_vendid, pb_vendcode, pb_vendname, pb_manname, 
-    pb_pdamount, pb_pbdamount, pb_preamount, pb_discounts, pb_havebalance, pb_recorderid, 
-    pb_recorder, pb_recorddate, pb_status, pb_statuscode, pb_remark, companyid, updaterId, 
-    updatedate, pb_text1, pb_text2, pb_text3, pb_text4, pb_text5
-  </sql>
-  <select id="selectByExample" parameterType="com.usoftchina.saas.money.po.PaybalanceExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from paybalance
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from paybalance
-    where pb_id = #{pb_id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from paybalance
-    where pb_id = #{pb_id,jdbcType=INTEGER}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.usoftchina.saas.money.po.PaybalanceExample">
-    delete from paybalance
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.usoftchina.saas.money.po.Paybalance">
-    insert into paybalance (pb_id, pb_code, pb_kind, 
-      pb_date, pb_vendid, pb_vendcode, 
-      pb_vendname, pb_manname, pb_pdamount, 
-      pb_pbdamount, pb_preamount, pb_discounts, 
-      pb_havebalance, pb_recorderid, pb_recorder, 
-      pb_recorddate, pb_status, pb_statuscode, 
-      pb_remark, companyid, updaterId, 
-      updatedate, pb_text1, pb_text2, 
-      pb_text3, pb_text4, pb_text5
-      )
-    values (#{pb_id,jdbcType=INTEGER}, #{pb_code,jdbcType=VARCHAR}, #{pb_kind,jdbcType=VARCHAR}, 
-      #{pb_date,jdbcType=TIMESTAMP}, #{pb_vendid,jdbcType=INTEGER}, #{pb_vendcode,jdbcType=VARCHAR}, 
-      #{pb_vendname,jdbcType=VARCHAR}, #{pb_manname,jdbcType=VARCHAR}, #{pb_pdamount,jdbcType=DOUBLE}, 
-      #{pb_pbdamount,jdbcType=DOUBLE}, #{pb_preamount,jdbcType=DOUBLE}, #{pb_discounts,jdbcType=DOUBLE}, 
-      #{pb_havebalance,jdbcType=DOUBLE}, #{pb_recorderid,jdbcType=INTEGER}, #{pb_recorder,jdbcType=VARCHAR}, 
-      #{pb_recorddate,jdbcType=TIMESTAMP}, #{pb_status,jdbcType=INTEGER}, #{pb_statuscode,jdbcType=DECIMAL}, 
-      #{pb_remark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, 
-      #{updatedate,jdbcType=TIMESTAMP}, #{pb_text1,jdbcType=VARCHAR}, #{pb_text2,jdbcType=VARCHAR}, 
-      #{pb_text3,jdbcType=VARCHAR}, #{pb_text4,jdbcType=VARCHAR}, #{pb_text5,jdbcType=VARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Paybalance">
-    insert into paybalance
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="pb_id != null">
-        pb_id,
-      </if>
-      <if test="pb_code != null">
-        pb_code,
-      </if>
-      <if test="pb_kind != null">
-        pb_kind,
-      </if>
-      <if test="pb_date != null">
-        pb_date,
-      </if>
-      <if test="pb_vendid != null">
-        pb_vendid,
-      </if>
-      <if test="pb_vendcode != null">
-        pb_vendcode,
-      </if>
-      <if test="pb_vendname != null">
-        pb_vendname,
-      </if>
-      <if test="pb_manname != null">
-        pb_manname,
-      </if>
-      <if test="pb_pdamount != null">
-        pb_pdamount,
-      </if>
-      <if test="pb_pbdamount != null">
-        pb_pbdamount,
-      </if>
-      <if test="pb_preamount != null">
-        pb_preamount,
-      </if>
-      <if test="pb_discounts != null">
-        pb_discounts,
-      </if>
-      <if test="pb_havebalance != null">
-        pb_havebalance,
-      </if>
-      <if test="pb_recorderid != null">
-        pb_recorderid,
-      </if>
-      <if test="pb_recorder != null">
-        pb_recorder,
-      </if>
-      <if test="pb_recorddate != null">
-        pb_recorddate,
-      </if>
-      <if test="pb_status != null">
-        pb_status,
-      </if>
-      <if test="pb_statuscode != null">
-        pb_statuscode,
-      </if>
-      <if test="pb_remark != null">
-        pb_remark,
-      </if>
-      <if test="companyid != null">
-        companyid,
-      </if>
-      <if test="updaterId != null">
-        updaterId,
-      </if>
-      <if test="updatedate != null">
-        updatedate,
-      </if>
-      <if test="pb_text1 != null">
-        pb_text1,
-      </if>
-      <if test="pb_text2 != null">
-        pb_text2,
-      </if>
-      <if test="pb_text3 != null">
-        pb_text3,
-      </if>
-      <if test="pb_text4 != null">
-        pb_text4,
-      </if>
-      <if test="pb_text5 != null">
-        pb_text5,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="pb_id != null">
-        #{pb_id,jdbcType=INTEGER},
-      </if>
-      <if test="pb_code != null">
-        #{pb_code,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_kind != null">
-        #{pb_kind,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_date != null">
-        #{pb_date,jdbcType=TIMESTAMP},
-      </if>
-      <if test="pb_vendid != null">
-        #{pb_vendid,jdbcType=INTEGER},
-      </if>
-      <if test="pb_vendcode != null">
-        #{pb_vendcode,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_vendname != null">
-        #{pb_vendname,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_manname != null">
-        #{pb_manname,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_pdamount != null">
-        #{pb_pdamount,jdbcType=DOUBLE},
-      </if>
-      <if test="pb_pbdamount != null">
-        #{pb_pbdamount,jdbcType=DOUBLE},
-      </if>
-      <if test="pb_preamount != null">
-        #{pb_preamount,jdbcType=DOUBLE},
-      </if>
-      <if test="pb_discounts != null">
-        #{pb_discounts,jdbcType=DOUBLE},
-      </if>
-      <if test="pb_havebalance != null">
-        #{pb_havebalance,jdbcType=DOUBLE},
-      </if>
-      <if test="pb_recorderid != null">
-        #{pb_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="pb_recorder != null">
-        #{pb_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_recorddate != null">
-        #{pb_recorddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="pb_status != null">
-        #{pb_status,jdbcType=INTEGER},
-      </if>
-      <if test="pb_statuscode != null">
-        #{pb_statuscode,jdbcType=DECIMAL},
-      </if>
-      <if test="pb_remark != null">
-        #{pb_remark,jdbcType=VARCHAR},
-      </if>
-      <if test="companyid != null">
-        #{companyid,jdbcType=INTEGER},
-      </if>
-      <if test="updaterId != null">
-        #{updaterId,jdbcType=INTEGER},
-      </if>
-      <if test="updatedate != null">
-        #{updatedate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="pb_text1 != null">
-        #{pb_text1,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_text2 != null">
-        #{pb_text2,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_text3 != null">
-        #{pb_text3,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_text4 != null">
-        #{pb_text4,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_text5 != null">
-        #{pb_text5,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.usoftchina.saas.money.po.PaybalanceExample" resultType="java.lang.Integer">
-    select count(*) from paybalance
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update paybalance
-    <set>
-      <if test="record.pb_id != null">
-        pb_id = #{record.pb_id,jdbcType=INTEGER},
-      </if>
-      <if test="record.pb_code != null">
-        pb_code = #{record.pb_code,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pb_kind != null">
-        pb_kind = #{record.pb_kind,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pb_date != null">
-        pb_date = #{record.pb_date,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.pb_vendid != null">
-        pb_vendid = #{record.pb_vendid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pb_vendcode != null">
-        pb_vendcode = #{record.pb_vendcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pb_vendname != null">
-        pb_vendname = #{record.pb_vendname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pb_manname != null">
-        pb_manname = #{record.pb_manname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pb_pdamount != null">
-        pb_pdamount = #{record.pb_pdamount,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pb_pbdamount != null">
-        pb_pbdamount = #{record.pb_pbdamount,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pb_preamount != null">
-        pb_preamount = #{record.pb_preamount,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pb_discounts != null">
-        pb_discounts = #{record.pb_discounts,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pb_havebalance != null">
-        pb_havebalance = #{record.pb_havebalance,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pb_recorderid != null">
-        pb_recorderid = #{record.pb_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pb_recorder != null">
-        pb_recorder = #{record.pb_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pb_recorddate != null">
-        pb_recorddate = #{record.pb_recorddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.pb_status != null">
-        pb_status = #{record.pb_status,jdbcType=INTEGER},
-      </if>
-      <if test="record.pb_statuscode != null">
-        pb_statuscode = #{record.pb_statuscode,jdbcType=DECIMAL},
-      </if>
-      <if test="record.pb_remark != null">
-        pb_remark = #{record.pb_remark,jdbcType=VARCHAR},
-      </if>
-      <if test="record.companyid != null">
-        companyid = #{record.companyid,jdbcType=INTEGER},
-      </if>
-      <if test="record.updaterId != null">
-        updaterId = #{record.updaterId,jdbcType=INTEGER},
-      </if>
-      <if test="record.updatedate != null">
-        updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.pb_text1 != null">
-        pb_text1 = #{record.pb_text1,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pb_text2 != null">
-        pb_text2 = #{record.pb_text2,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pb_text3 != null">
-        pb_text3 = #{record.pb_text3,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pb_text4 != null">
-        pb_text4 = #{record.pb_text4,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pb_text5 != null">
-        pb_text5 = #{record.pb_text5,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update paybalance
-    set pb_id = #{record.pb_id,jdbcType=INTEGER},
-      pb_code = #{record.pb_code,jdbcType=VARCHAR},
-      pb_kind = #{record.pb_kind,jdbcType=VARCHAR},
-      pb_date = #{record.pb_date,jdbcType=TIMESTAMP},
-      pb_vendid = #{record.pb_vendid,jdbcType=INTEGER},
-      pb_vendcode = #{record.pb_vendcode,jdbcType=VARCHAR},
-      pb_vendname = #{record.pb_vendname,jdbcType=VARCHAR},
-      pb_manname = #{record.pb_manname,jdbcType=VARCHAR},
-      pb_pdamount = #{record.pb_pdamount,jdbcType=DOUBLE},
-      pb_pbdamount = #{record.pb_pbdamount,jdbcType=DOUBLE},
-      pb_preamount = #{record.pb_preamount,jdbcType=DOUBLE},
-      pb_discounts = #{record.pb_discounts,jdbcType=DOUBLE},
-      pb_havebalance = #{record.pb_havebalance,jdbcType=DOUBLE},
-      pb_recorderid = #{record.pb_recorderid,jdbcType=INTEGER},
-      pb_recorder = #{record.pb_recorder,jdbcType=VARCHAR},
-      pb_recorddate = #{record.pb_recorddate,jdbcType=TIMESTAMP},
-      pb_status = #{record.pb_status,jdbcType=INTEGER},
-      pb_statuscode = #{record.pb_statuscode,jdbcType=DECIMAL},
-      pb_remark = #{record.pb_remark,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
-      updaterId = #{record.updaterId,jdbcType=INTEGER},
-      updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
-      pb_text1 = #{record.pb_text1,jdbcType=VARCHAR},
-      pb_text2 = #{record.pb_text2,jdbcType=VARCHAR},
-      pb_text3 = #{record.pb_text3,jdbcType=VARCHAR},
-      pb_text4 = #{record.pb_text4,jdbcType=VARCHAR},
-      pb_text5 = #{record.pb_text5,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Paybalance">
-    update paybalance
-    <set>
-      <if test="pb_code != null">
-        pb_code = #{pb_code,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_kind != null">
-        pb_kind = #{pb_kind,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_date != null">
-        pb_date = #{pb_date,jdbcType=TIMESTAMP},
-      </if>
-      <if test="pb_vendid != null">
-        pb_vendid = #{pb_vendid,jdbcType=INTEGER},
-      </if>
-      <if test="pb_vendcode != null">
-        pb_vendcode = #{pb_vendcode,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_vendname != null">
-        pb_vendname = #{pb_vendname,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_manname != null">
-        pb_manname = #{pb_manname,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_pdamount != null">
-        pb_pdamount = #{pb_pdamount,jdbcType=DOUBLE},
-      </if>
-      <if test="pb_pbdamount != null">
-        pb_pbdamount = #{pb_pbdamount,jdbcType=DOUBLE},
-      </if>
-      <if test="pb_preamount != null">
-        pb_preamount = #{pb_preamount,jdbcType=DOUBLE},
-      </if>
-      <if test="pb_discounts != null">
-        pb_discounts = #{pb_discounts,jdbcType=DOUBLE},
-      </if>
-      <if test="pb_havebalance != null">
-        pb_havebalance = #{pb_havebalance,jdbcType=DOUBLE},
-      </if>
-      <if test="pb_recorderid != null">
-        pb_recorderid = #{pb_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="pb_recorder != null">
-        pb_recorder = #{pb_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_recorddate != null">
-        pb_recorddate = #{pb_recorddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="pb_status != null">
-        pb_status = #{pb_status,jdbcType=INTEGER},
-      </if>
-      <if test="pb_statuscode != null">
-        pb_statuscode = #{pb_statuscode,jdbcType=DECIMAL},
-      </if>
-      <if test="pb_remark != null">
-        pb_remark = #{pb_remark,jdbcType=VARCHAR},
-      </if>
-      <if test="companyid != null">
-        companyid = #{companyid,jdbcType=INTEGER},
-      </if>
-      <if test="updaterId != null">
-        updaterId = #{updaterId,jdbcType=INTEGER},
-      </if>
-      <if test="updatedate != null">
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="pb_text1 != null">
-        pb_text1 = #{pb_text1,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_text2 != null">
-        pb_text2 = #{pb_text2,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_text3 != null">
-        pb_text3 = #{pb_text3,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_text4 != null">
-        pb_text4 = #{pb_text4,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_text5 != null">
-        pb_text5 = #{pb_text5,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where pb_id = #{pb_id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.money.po.Paybalance">
-    update paybalance
-    set pb_code = #{pb_code,jdbcType=VARCHAR},
-      pb_kind = #{pb_kind,jdbcType=VARCHAR},
-      pb_date = #{pb_date,jdbcType=TIMESTAMP},
-      pb_vendid = #{pb_vendid,jdbcType=INTEGER},
-      pb_vendcode = #{pb_vendcode,jdbcType=VARCHAR},
-      pb_vendname = #{pb_vendname,jdbcType=VARCHAR},
-      pb_manname = #{pb_manname,jdbcType=VARCHAR},
-      pb_pdamount = #{pb_pdamount,jdbcType=DOUBLE},
-      pb_pbdamount = #{pb_pbdamount,jdbcType=DOUBLE},
-      pb_preamount = #{pb_preamount,jdbcType=DOUBLE},
-      pb_discounts = #{pb_discounts,jdbcType=DOUBLE},
-      pb_havebalance = #{pb_havebalance,jdbcType=DOUBLE},
-      pb_recorderid = #{pb_recorderid,jdbcType=INTEGER},
-      pb_recorder = #{pb_recorder,jdbcType=VARCHAR},
-      pb_recorddate = #{pb_recorddate,jdbcType=TIMESTAMP},
-      pb_status = #{pb_status,jdbcType=INTEGER},
-      pb_statuscode = #{pb_statuscode,jdbcType=DECIMAL},
-      pb_remark = #{pb_remark,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
-      updaterId = #{updaterId,jdbcType=INTEGER},
-      updatedate = #{updatedate,jdbcType=TIMESTAMP},
-      pb_text1 = #{pb_text1,jdbcType=VARCHAR},
-      pb_text2 = #{pb_text2,jdbcType=VARCHAR},
-      pb_text3 = #{pb_text3,jdbcType=VARCHAR},
-      pb_text4 = #{pb_text4,jdbcType=VARCHAR},
-      pb_text5 = #{pb_text5,jdbcType=VARCHAR}
-    where pb_id = #{pb_id,jdbcType=INTEGER}
-  </update>
+
 </mapper>

applications/money/money-server/src/main/resources/mapper/RecbalanceMapper.xml

@@ -557,560 +557,5 @@
       rb_text5 = #{rb_text5,jdbcType=VARCHAR}
     where rb_id = #{rb_id,jdbcType=INTEGER}
   </update>
-  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Recbalance">
-    <id column="rb_id" jdbcType="INTEGER" property="rb_id" />
-    <result column="rb_code" jdbcType="VARCHAR" property="rb_code" />
-    <result column="rb_kind" jdbcType="VARCHAR" property="rb_kind" />
-    <result column="rb_date" jdbcType="TIMESTAMP" property="rb_date" />
-    <result column="rb_custid" jdbcType="INTEGER" property="rb_custid" />
-    <result column="rb_custcode" jdbcType="VARCHAR" property="rb_custcode" />
-    <result column="rb_custname" jdbcType="VARCHAR" property="rb_custname" />
-    <result column="rb_manname" jdbcType="VARCHAR" property="rb_manname" />
-    <result column="rb_rdamount" jdbcType="DOUBLE" property="rb_rdamount" />
-    <result column="rb_rbdamount" jdbcType="DOUBLE" property="rb_rbdamount" />
-    <result column="rb_preamount" jdbcType="DOUBLE" property="rb_preamount" />
-    <result column="rb_discounts" jdbcType="DOUBLE" property="rb_discounts" />
-    <result column="rb_havebalance" jdbcType="DOUBLE" property="rb_havebalance" />
-    <result column="rb_recorderid" jdbcType="INTEGER" property="rb_recorderid" />
-    <result column="rb_recorder" jdbcType="VARCHAR" property="rb_recorder" />
-    <result column="rb_recorddate" jdbcType="TIMESTAMP" property="rb_recorddate" />
-    <result column="rb_status" jdbcType="INTEGER" property="rb_status" />
-    <result column="rb_statuscode" jdbcType="DECIMAL" property="rb_statuscode" />
-    <result column="rb_remark" jdbcType="VARCHAR" property="rb_remark" />
-    <result column="companyid" jdbcType="INTEGER" property="companyid" />
-    <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
-    <result column="updatedate" jdbcType="TIMESTAMP" property="updatedate" />
-    <result column="rb_text1" jdbcType="VARCHAR" property="rb_text1" />
-    <result column="rb_text2" jdbcType="VARCHAR" property="rb_text2" />
-    <result column="rb_text3" jdbcType="VARCHAR" property="rb_text3" />
-    <result column="rb_text4" jdbcType="VARCHAR" property="rb_text4" />
-    <result column="rb_text5" jdbcType="VARCHAR" property="rb_text5" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    rb_id, rb_code, rb_kind, rb_date, rb_custid, rb_custcode, rb_custname, rb_manname, 
-    rb_rdamount, rb_rbdamount, rb_preamount, rb_discounts, rb_havebalance, rb_recorderid, 
-    rb_recorder, rb_recorddate, rb_status, rb_statuscode, rb_remark, companyid, updaterId, 
-    updatedate, rb_text1, rb_text2, rb_text3, rb_text4, rb_text5
-  </sql>
-  <select id="selectByExample" parameterType="com.usoftchina.saas.money.po.RecbalanceExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from recbalance
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from recbalance
-    where rb_id = #{rb_id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from recbalance
-    where rb_id = #{rb_id,jdbcType=INTEGER}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.usoftchina.saas.money.po.RecbalanceExample">
-    delete from recbalance
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.usoftchina.saas.money.po.Recbalance">
-    insert into recbalance (rb_id, rb_code, rb_kind, 
-      rb_date, rb_custid, rb_custcode, 
-      rb_custname, rb_manname, rb_rdamount, 
-      rb_rbdamount, rb_preamount, rb_discounts, 
-      rb_havebalance, rb_recorderid, rb_recorder, 
-      rb_recorddate, rb_status, rb_statuscode, 
-      rb_remark, companyid, updaterId, 
-      updatedate, rb_text1, rb_text2, 
-      rb_text3, rb_text4, rb_text5
-      )
-    values (#{rb_id,jdbcType=INTEGER}, #{rb_code,jdbcType=VARCHAR}, #{rb_kind,jdbcType=VARCHAR}, 
-      #{rb_date,jdbcType=TIMESTAMP}, #{rb_custid,jdbcType=INTEGER}, #{rb_custcode,jdbcType=VARCHAR}, 
-      #{rb_custname,jdbcType=VARCHAR}, #{rb_manname,jdbcType=VARCHAR}, #{rb_rdamount,jdbcType=DOUBLE}, 
-      #{rb_rbdamount,jdbcType=DOUBLE}, #{rb_preamount,jdbcType=DOUBLE}, #{rb_discounts,jdbcType=DOUBLE}, 
-      #{rb_havebalance,jdbcType=DOUBLE}, #{rb_recorderid,jdbcType=INTEGER}, #{rb_recorder,jdbcType=VARCHAR}, 
-      #{rb_recorddate,jdbcType=TIMESTAMP}, #{rb_status,jdbcType=INTEGER}, #{rb_statuscode,jdbcType=DECIMAL}, 
-      #{rb_remark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, 
-      #{updatedate,jdbcType=TIMESTAMP}, #{rb_text1,jdbcType=VARCHAR}, #{rb_text2,jdbcType=VARCHAR}, 
-      #{rb_text3,jdbcType=VARCHAR}, #{rb_text4,jdbcType=VARCHAR}, #{rb_text5,jdbcType=VARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Recbalance">
-    insert into recbalance
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="rb_id != null">
-        rb_id,
-      </if>
-      <if test="rb_code != null">
-        rb_code,
-      </if>
-      <if test="rb_kind != null">
-        rb_kind,
-      </if>
-      <if test="rb_date != null">
-        rb_date,
-      </if>
-      <if test="rb_custid != null">
-        rb_custid,
-      </if>
-      <if test="rb_custcode != null">
-        rb_custcode,
-      </if>
-      <if test="rb_custname != null">
-        rb_custname,
-      </if>
-      <if test="rb_manname != null">
-        rb_manname,
-      </if>
-      <if test="rb_rdamount != null">
-        rb_rdamount,
-      </if>
-      <if test="rb_rbdamount != null">
-        rb_rbdamount,
-      </if>
-      <if test="rb_preamount != null">
-        rb_preamount,
-      </if>
-      <if test="rb_discounts != null">
-        rb_discounts,
-      </if>
-      <if test="rb_havebalance != null">
-        rb_havebalance,
-      </if>
-      <if test="rb_recorderid != null">
-        rb_recorderid,
-      </if>
-      <if test="rb_recorder != null">
-        rb_recorder,
-      </if>
-      <if test="rb_recorddate != null">
-        rb_recorddate,
-      </if>
-      <if test="rb_status != null">
-        rb_status,
-      </if>
-      <if test="rb_statuscode != null">
-        rb_statuscode,
-      </if>
-      <if test="rb_remark != null">
-        rb_remark,
-      </if>
-      <if test="companyid != null">
-        companyid,
-      </if>
-      <if test="updaterId != null">
-        updaterId,
-      </if>
-      <if test="updatedate != null">
-        updatedate,
-      </if>
-      <if test="rb_text1 != null">
-        rb_text1,
-      </if>
-      <if test="rb_text2 != null">
-        rb_text2,
-      </if>
-      <if test="rb_text3 != null">
-        rb_text3,
-      </if>
-      <if test="rb_text4 != null">
-        rb_text4,
-      </if>
-      <if test="rb_text5 != null">
-        rb_text5,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="rb_id != null">
-        #{rb_id,jdbcType=INTEGER},
-      </if>
-      <if test="rb_code != null">
-        #{rb_code,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_kind != null">
-        #{rb_kind,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_date != null">
-        #{rb_date,jdbcType=TIMESTAMP},
-      </if>
-      <if test="rb_custid != null">
-        #{rb_custid,jdbcType=INTEGER},
-      </if>
-      <if test="rb_custcode != null">
-        #{rb_custcode,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_custname != null">
-        #{rb_custname,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_manname != null">
-        #{rb_manname,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_rdamount != null">
-        #{rb_rdamount,jdbcType=DOUBLE},
-      </if>
-      <if test="rb_rbdamount != null">
-        #{rb_rbdamount,jdbcType=DOUBLE},
-      </if>
-      <if test="rb_preamount != null">
-        #{rb_preamount,jdbcType=DOUBLE},
-      </if>
-      <if test="rb_discounts != null">
-        #{rb_discounts,jdbcType=DOUBLE},
-      </if>
-      <if test="rb_havebalance != null">
-        #{rb_havebalance,jdbcType=DOUBLE},
-      </if>
-      <if test="rb_recorderid != null">
-        #{rb_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="rb_recorder != null">
-        #{rb_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_recorddate != null">
-        #{rb_recorddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="rb_status != null">
-        #{rb_status,jdbcType=INTEGER},
-      </if>
-      <if test="rb_statuscode != null">
-        #{rb_statuscode,jdbcType=DECIMAL},
-      </if>
-      <if test="rb_remark != null">
-        #{rb_remark,jdbcType=VARCHAR},
-      </if>
-      <if test="companyid != null">
-        #{companyid,jdbcType=INTEGER},
-      </if>
-      <if test="updaterId != null">
-        #{updaterId,jdbcType=INTEGER},
-      </if>
-      <if test="updatedate != null">
-        #{updatedate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="rb_text1 != null">
-        #{rb_text1,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_text2 != null">
-        #{rb_text2,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_text3 != null">
-        #{rb_text3,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_text4 != null">
-        #{rb_text4,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_text5 != null">
-        #{rb_text5,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.usoftchina.saas.money.po.RecbalanceExample" resultType="java.lang.Integer">
-    select count(*) from recbalance
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update recbalance
-    <set>
-      <if test="record.rb_id != null">
-        rb_id = #{record.rb_id,jdbcType=INTEGER},
-      </if>
-      <if test="record.rb_code != null">
-        rb_code = #{record.rb_code,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rb_kind != null">
-        rb_kind = #{record.rb_kind,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rb_date != null">
-        rb_date = #{record.rb_date,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.rb_custid != null">
-        rb_custid = #{record.rb_custid,jdbcType=INTEGER},
-      </if>
-      <if test="record.rb_custcode != null">
-        rb_custcode = #{record.rb_custcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rb_custname != null">
-        rb_custname = #{record.rb_custname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rb_manname != null">
-        rb_manname = #{record.rb_manname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rb_rdamount != null">
-        rb_rdamount = #{record.rb_rdamount,jdbcType=DOUBLE},
-      </if>
-      <if test="record.rb_rbdamount != null">
-        rb_rbdamount = #{record.rb_rbdamount,jdbcType=DOUBLE},
-      </if>
-      <if test="record.rb_preamount != null">
-        rb_preamount = #{record.rb_preamount,jdbcType=DOUBLE},
-      </if>
-      <if test="record.rb_discounts != null">
-        rb_discounts = #{record.rb_discounts,jdbcType=DOUBLE},
-      </if>
-      <if test="record.rb_havebalance != null">
-        rb_havebalance = #{record.rb_havebalance,jdbcType=DOUBLE},
-      </if>
-      <if test="record.rb_recorderid != null">
-        rb_recorderid = #{record.rb_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="record.rb_recorder != null">
-        rb_recorder = #{record.rb_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rb_recorddate != null">
-        rb_recorddate = #{record.rb_recorddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.rb_status != null">
-        rb_status = #{record.rb_status,jdbcType=INTEGER},
-      </if>
-      <if test="record.rb_statuscode != null">
-        rb_statuscode = #{record.rb_statuscode,jdbcType=DECIMAL},
-      </if>
-      <if test="record.rb_remark != null">
-        rb_remark = #{record.rb_remark,jdbcType=VARCHAR},
-      </if>
-      <if test="record.companyid != null">
-        companyid = #{record.companyid,jdbcType=INTEGER},
-      </if>
-      <if test="record.updaterId != null">
-        updaterId = #{record.updaterId,jdbcType=INTEGER},
-      </if>
-      <if test="record.updatedate != null">
-        updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.rb_text1 != null">
-        rb_text1 = #{record.rb_text1,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rb_text2 != null">
-        rb_text2 = #{record.rb_text2,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rb_text3 != null">
-        rb_text3 = #{record.rb_text3,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rb_text4 != null">
-        rb_text4 = #{record.rb_text4,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rb_text5 != null">
-        rb_text5 = #{record.rb_text5,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update recbalance
-    set rb_id = #{record.rb_id,jdbcType=INTEGER},
-      rb_code = #{record.rb_code,jdbcType=VARCHAR},
-      rb_kind = #{record.rb_kind,jdbcType=VARCHAR},
-      rb_date = #{record.rb_date,jdbcType=TIMESTAMP},
-      rb_custid = #{record.rb_custid,jdbcType=INTEGER},
-      rb_custcode = #{record.rb_custcode,jdbcType=VARCHAR},
-      rb_custname = #{record.rb_custname,jdbcType=VARCHAR},
-      rb_manname = #{record.rb_manname,jdbcType=VARCHAR},
-      rb_rdamount = #{record.rb_rdamount,jdbcType=DOUBLE},
-      rb_rbdamount = #{record.rb_rbdamount,jdbcType=DOUBLE},
-      rb_preamount = #{record.rb_preamount,jdbcType=DOUBLE},
-      rb_discounts = #{record.rb_discounts,jdbcType=DOUBLE},
-      rb_havebalance = #{record.rb_havebalance,jdbcType=DOUBLE},
-      rb_recorderid = #{record.rb_recorderid,jdbcType=INTEGER},
-      rb_recorder = #{record.rb_recorder,jdbcType=VARCHAR},
-      rb_recorddate = #{record.rb_recorddate,jdbcType=TIMESTAMP},
-      rb_status = #{record.rb_status,jdbcType=INTEGER},
-      rb_statuscode = #{record.rb_statuscode,jdbcType=DECIMAL},
-      rb_remark = #{record.rb_remark,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
-      updaterId = #{record.updaterId,jdbcType=INTEGER},
-      updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
-      rb_text1 = #{record.rb_text1,jdbcType=VARCHAR},
-      rb_text2 = #{record.rb_text2,jdbcType=VARCHAR},
-      rb_text3 = #{record.rb_text3,jdbcType=VARCHAR},
-      rb_text4 = #{record.rb_text4,jdbcType=VARCHAR},
-      rb_text5 = #{record.rb_text5,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Recbalance">
-    update recbalance
-    <set>
-      <if test="rb_code != null">
-        rb_code = #{rb_code,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_kind != null">
-        rb_kind = #{rb_kind,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_date != null">
-        rb_date = #{rb_date,jdbcType=TIMESTAMP},
-      </if>
-      <if test="rb_custid != null">
-        rb_custid = #{rb_custid,jdbcType=INTEGER},
-      </if>
-      <if test="rb_custcode != null">
-        rb_custcode = #{rb_custcode,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_custname != null">
-        rb_custname = #{rb_custname,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_manname != null">
-        rb_manname = #{rb_manname,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_rdamount != null">
-        rb_rdamount = #{rb_rdamount,jdbcType=DOUBLE},
-      </if>
-      <if test="rb_rbdamount != null">
-        rb_rbdamount = #{rb_rbdamount,jdbcType=DOUBLE},
-      </if>
-      <if test="rb_preamount != null">
-        rb_preamount = #{rb_preamount,jdbcType=DOUBLE},
-      </if>
-      <if test="rb_discounts != null">
-        rb_discounts = #{rb_discounts,jdbcType=DOUBLE},
-      </if>
-      <if test="rb_havebalance != null">
-        rb_havebalance = #{rb_havebalance,jdbcType=DOUBLE},
-      </if>
-      <if test="rb_recorderid != null">
-        rb_recorderid = #{rb_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="rb_recorder != null">
-        rb_recorder = #{rb_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_recorddate != null">
-        rb_recorddate = #{rb_recorddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="rb_status != null">
-        rb_status = #{rb_status,jdbcType=INTEGER},
-      </if>
-      <if test="rb_statuscode != null">
-        rb_statuscode = #{rb_statuscode,jdbcType=DECIMAL},
-      </if>
-      <if test="rb_remark != null">
-        rb_remark = #{rb_remark,jdbcType=VARCHAR},
-      </if>
-      <if test="companyid != null">
-        companyid = #{companyid,jdbcType=INTEGER},
-      </if>
-      <if test="updaterId != null">
-        updaterId = #{updaterId,jdbcType=INTEGER},
-      </if>
-      <if test="updatedate != null">
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="rb_text1 != null">
-        rb_text1 = #{rb_text1,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_text2 != null">
-        rb_text2 = #{rb_text2,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_text3 != null">
-        rb_text3 = #{rb_text3,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_text4 != null">
-        rb_text4 = #{rb_text4,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_text5 != null">
-        rb_text5 = #{rb_text5,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where rb_id = #{rb_id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.money.po.Recbalance">
-    update recbalance
-    set rb_code = #{rb_code,jdbcType=VARCHAR},
-      rb_kind = #{rb_kind,jdbcType=VARCHAR},
-      rb_date = #{rb_date,jdbcType=TIMESTAMP},
-      rb_custid = #{rb_custid,jdbcType=INTEGER},
-      rb_custcode = #{rb_custcode,jdbcType=VARCHAR},
-      rb_custname = #{rb_custname,jdbcType=VARCHAR},
-      rb_manname = #{rb_manname,jdbcType=VARCHAR},
-      rb_rdamount = #{rb_rdamount,jdbcType=DOUBLE},
-      rb_rbdamount = #{rb_rbdamount,jdbcType=DOUBLE},
-      rb_preamount = #{rb_preamount,jdbcType=DOUBLE},
-      rb_discounts = #{rb_discounts,jdbcType=DOUBLE},
-      rb_havebalance = #{rb_havebalance,jdbcType=DOUBLE},
-      rb_recorderid = #{rb_recorderid,jdbcType=INTEGER},
-      rb_recorder = #{rb_recorder,jdbcType=VARCHAR},
-      rb_recorddate = #{rb_recorddate,jdbcType=TIMESTAMP},
-      rb_status = #{rb_status,jdbcType=INTEGER},
-      rb_statuscode = #{rb_statuscode,jdbcType=DECIMAL},
-      rb_remark = #{rb_remark,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
-      updaterId = #{updaterId,jdbcType=INTEGER},
-      updatedate = #{updatedate,jdbcType=TIMESTAMP},
-      rb_text1 = #{rb_text1,jdbcType=VARCHAR},
-      rb_text2 = #{rb_text2,jdbcType=VARCHAR},
-      rb_text3 = #{rb_text3,jdbcType=VARCHAR},
-      rb_text4 = #{rb_text4,jdbcType=VARCHAR},
-      rb_text5 = #{rb_text5,jdbcType=VARCHAR}
-    where rb_id = #{rb_id,jdbcType=INTEGER}
-  </update>
+
 </mapper>

applications/money/money-server/src/main/resources/mapper/RecbalancedetMapper.xml

@@ -430,433 +430,5 @@
       rd_text5 = #{rd_text5,jdbcType=VARCHAR}
     where rd_id = #{rd_id,jdbcType=INTEGER}
   </update>
-  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Recbalancedet">
-    <id column="rd_id" jdbcType="INTEGER" property="rd_id" />
-    <result column="rd_rbid" jdbcType="INTEGER" property="rd_rbid" />
-    <result column="rd_detno" jdbcType="INTEGER" property="rd_detno" />
-    <result column="rd_ym" jdbcType="INTEGER" property="rd_ym" />
-    <result column="rd_bankid" jdbcType="INTEGER" property="rd_bankid" />
-    <result column="rd_bankcode" jdbcType="VARCHAR" property="rd_bankcode" />
-    <result column="rd_bankname" jdbcType="VARCHAR" property="rd_bankname" />
-    <result column="rd_amount" jdbcType="DOUBLE" property="rd_amount" />
-    <result column="rd_paymethod" jdbcType="VARCHAR" property="rd_paymethod" />
-    <result column="rd_paycode" jdbcType="VARCHAR" property="rd_paycode" />
-    <result column="rd_remark" jdbcType="VARCHAR" property="rd_remark" />
-    <result column="companyid" jdbcType="INTEGER" property="companyid" />
-    <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
-    <result column="updatedate" jdbcType="TIMESTAMP" property="updatedate" />
-    <result column="rd_text1" jdbcType="VARCHAR" property="rd_text1" />
-    <result column="rd_text2" jdbcType="VARCHAR" property="rd_text2" />
-    <result column="rd_text3" jdbcType="VARCHAR" property="rd_text3" />
-    <result column="rd_text4" jdbcType="VARCHAR" property="rd_text4" />
-    <result column="rd_text5" jdbcType="VARCHAR" property="rd_text5" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    rd_id, rd_rbid, rd_detno, rd_ym, rd_bankid, rd_bankcode, rd_bankname, rd_amount, 
-    rd_paymethod, rd_paycode, rd_remark, companyid, updaterId, updatedate, rd_text1, 
-    rd_text2, rd_text3, rd_text4, rd_text5
-  </sql>
-  <select id="selectByExample" parameterType="com.usoftchina.saas.money.po.RecbalancedetExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from recbalancedet
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from recbalancedet
-    where rd_id = #{rd_id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from recbalancedet
-    where rd_id = #{rd_id,jdbcType=INTEGER}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.usoftchina.saas.money.po.RecbalancedetExample">
-    delete from recbalancedet
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.usoftchina.saas.money.po.Recbalancedet">
-    insert into recbalancedet (rd_id, rd_rbid, rd_detno, 
-      rd_ym, rd_bankid, rd_bankcode, 
-      rd_bankname, rd_amount, rd_paymethod, 
-      rd_paycode, rd_remark, companyid, 
-      updaterId, updatedate, rd_text1, 
-      rd_text2, rd_text3, rd_text4, 
-      rd_text5)
-    values (#{rd_id,jdbcType=INTEGER}, #{rd_rbid,jdbcType=INTEGER}, #{rd_detno,jdbcType=INTEGER}, 
-      #{rd_ym,jdbcType=INTEGER}, #{rd_bankid,jdbcType=INTEGER}, #{rd_bankcode,jdbcType=VARCHAR}, 
-      #{rd_bankname,jdbcType=VARCHAR}, #{rd_amount,jdbcType=DOUBLE}, #{rd_paymethod,jdbcType=VARCHAR}, 
-      #{rd_paycode,jdbcType=VARCHAR}, #{rd_remark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, 
-      #{updaterId,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, #{rd_text1,jdbcType=VARCHAR}, 
-      #{rd_text2,jdbcType=VARCHAR}, #{rd_text3,jdbcType=VARCHAR}, #{rd_text4,jdbcType=VARCHAR}, 
-      #{rd_text5,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Recbalancedet">
-    insert into recbalancedet
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="rd_id != null">
-        rd_id,
-      </if>
-      <if test="rd_rbid != null">
-        rd_rbid,
-      </if>
-      <if test="rd_detno != null">
-        rd_detno,
-      </if>
-      <if test="rd_ym != null">
-        rd_ym,
-      </if>
-      <if test="rd_bankid != null">
-        rd_bankid,
-      </if>
-      <if test="rd_bankcode != null">
-        rd_bankcode,
-      </if>
-      <if test="rd_bankname != null">
-        rd_bankname,
-      </if>
-      <if test="rd_amount != null">
-        rd_amount,
-      </if>
-      <if test="rd_paymethod != null">
-        rd_paymethod,
-      </if>
-      <if test="rd_paycode != null">
-        rd_paycode,
-      </if>
-      <if test="rd_remark != null">
-        rd_remark,
-      </if>
-      <if test="companyid != null">
-        companyid,
-      </if>
-      <if test="updaterId != null">
-        updaterId,
-      </if>
-      <if test="updatedate != null">
-        updatedate,
-      </if>
-      <if test="rd_text1 != null">
-        rd_text1,
-      </if>
-      <if test="rd_text2 != null">
-        rd_text2,
-      </if>
-      <if test="rd_text3 != null">
-        rd_text3,
-      </if>
-      <if test="rd_text4 != null">
-        rd_text4,
-      </if>
-      <if test="rd_text5 != null">
-        rd_text5,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="rd_id != null">
-        #{rd_id,jdbcType=INTEGER},
-      </if>
-      <if test="rd_rbid != null">
-        #{rd_rbid,jdbcType=INTEGER},
-      </if>
-      <if test="rd_detno != null">
-        #{rd_detno,jdbcType=INTEGER},
-      </if>
-      <if test="rd_ym != null">
-        #{rd_ym,jdbcType=INTEGER},
-      </if>
-      <if test="rd_bankid != null">
-        #{rd_bankid,jdbcType=INTEGER},
-      </if>
-      <if test="rd_bankcode != null">
-        #{rd_bankcode,jdbcType=VARCHAR},
-      </if>
-      <if test="rd_bankname != null">
-        #{rd_bankname,jdbcType=VARCHAR},
-      </if>
-      <if test="rd_amount != null">
-        #{rd_amount,jdbcType=DOUBLE},
-      </if>
-      <if test="rd_paymethod != null">
-        #{rd_paymethod,jdbcType=VARCHAR},
-      </if>
-      <if test="rd_paycode != null">
-        #{rd_paycode,jdbcType=VARCHAR},
-      </if>
-      <if test="rd_remark != null">
-        #{rd_remark,jdbcType=VARCHAR},
-      </if>
-      <if test="companyid != null">
-        #{companyid,jdbcType=INTEGER},
-      </if>
-      <if test="updaterId != null">
-        #{updaterId,jdbcType=INTEGER},
-      </if>
-      <if test="updatedate != null">
-        #{updatedate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="rd_text1 != null">
-        #{rd_text1,jdbcType=VARCHAR},
-      </if>
-      <if test="rd_text2 != null">
-        #{rd_text2,jdbcType=VARCHAR},
-      </if>
-      <if test="rd_text3 != null">
-        #{rd_text3,jdbcType=VARCHAR},
-      </if>
-      <if test="rd_text4 != null">
-        #{rd_text4,jdbcType=VARCHAR},
-      </if>
-      <if test="rd_text5 != null">
-        #{rd_text5,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.usoftchina.saas.money.po.RecbalancedetExample" resultType="java.lang.Integer">
-    select count(*) from recbalancedet
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update recbalancedet
-    <set>
-      <if test="record.rd_id != null">
-        rd_id = #{record.rd_id,jdbcType=INTEGER},
-      </if>
-      <if test="record.rd_rbid != null">
-        rd_rbid = #{record.rd_rbid,jdbcType=INTEGER},
-      </if>
-      <if test="record.rd_detno != null">
-        rd_detno = #{record.rd_detno,jdbcType=INTEGER},
-      </if>
-      <if test="record.rd_ym != null">
-        rd_ym = #{record.rd_ym,jdbcType=INTEGER},
-      </if>
-      <if test="record.rd_bankid != null">
-        rd_bankid = #{record.rd_bankid,jdbcType=INTEGER},
-      </if>
-      <if test="record.rd_bankcode != null">
-        rd_bankcode = #{record.rd_bankcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rd_bankname != null">
-        rd_bankname = #{record.rd_bankname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rd_amount != null">
-        rd_amount = #{record.rd_amount,jdbcType=DOUBLE},
-      </if>
-      <if test="record.rd_paymethod != null">
-        rd_paymethod = #{record.rd_paymethod,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rd_paycode != null">
-        rd_paycode = #{record.rd_paycode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rd_remark != null">
-        rd_remark = #{record.rd_remark,jdbcType=VARCHAR},
-      </if>
-      <if test="record.companyid != null">
-        companyid = #{record.companyid,jdbcType=INTEGER},
-      </if>
-      <if test="record.updaterId != null">
-        updaterId = #{record.updaterId,jdbcType=INTEGER},
-      </if>
-      <if test="record.updatedate != null">
-        updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.rd_text1 != null">
-        rd_text1 = #{record.rd_text1,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rd_text2 != null">
-        rd_text2 = #{record.rd_text2,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rd_text3 != null">
-        rd_text3 = #{record.rd_text3,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rd_text4 != null">
-        rd_text4 = #{record.rd_text4,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rd_text5 != null">
-        rd_text5 = #{record.rd_text5,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update recbalancedet
-    set rd_id = #{record.rd_id,jdbcType=INTEGER},
-      rd_rbid = #{record.rd_rbid,jdbcType=INTEGER},
-      rd_detno = #{record.rd_detno,jdbcType=INTEGER},
-      rd_ym = #{record.rd_ym,jdbcType=INTEGER},
-      rd_bankid = #{record.rd_bankid,jdbcType=INTEGER},
-      rd_bankcode = #{record.rd_bankcode,jdbcType=VARCHAR},
-      rd_bankname = #{record.rd_bankname,jdbcType=VARCHAR},
-      rd_amount = #{record.rd_amount,jdbcType=DOUBLE},
-      rd_paymethod = #{record.rd_paymethod,jdbcType=VARCHAR},
-      rd_paycode = #{record.rd_paycode,jdbcType=VARCHAR},
-      rd_remark = #{record.rd_remark,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
-      updaterId = #{record.updaterId,jdbcType=INTEGER},
-      updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
-      rd_text1 = #{record.rd_text1,jdbcType=VARCHAR},
-      rd_text2 = #{record.rd_text2,jdbcType=VARCHAR},
-      rd_text3 = #{record.rd_text3,jdbcType=VARCHAR},
-      rd_text4 = #{record.rd_text4,jdbcType=VARCHAR},
-      rd_text5 = #{record.rd_text5,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Recbalancedet">
-    update recbalancedet
-    <set>
-      <if test="rd_rbid != null">
-        rd_rbid = #{rd_rbid,jdbcType=INTEGER},
-      </if>
-      <if test="rd_detno != null">
-        rd_detno = #{rd_detno,jdbcType=INTEGER},
-      </if>
-      <if test="rd_ym != null">
-        rd_ym = #{rd_ym,jdbcType=INTEGER},
-      </if>
-      <if test="rd_bankid != null">
-        rd_bankid = #{rd_bankid,jdbcType=INTEGER},
-      </if>
-      <if test="rd_bankcode != null">
-        rd_bankcode = #{rd_bankcode,jdbcType=VARCHAR},
-      </if>
-      <if test="rd_bankname != null">
-        rd_bankname = #{rd_bankname,jdbcType=VARCHAR},
-      </if>
-      <if test="rd_amount != null">
-        rd_amount = #{rd_amount,jdbcType=DOUBLE},
-      </if>
-      <if test="rd_paymethod != null">
-        rd_paymethod = #{rd_paymethod,jdbcType=VARCHAR},
-      </if>
-      <if test="rd_paycode != null">
-        rd_paycode = #{rd_paycode,jdbcType=VARCHAR},
-      </if>
-      <if test="rd_remark != null">
-        rd_remark = #{rd_remark,jdbcType=VARCHAR},
-      </if>
-      <if test="companyid != null">
-        companyid = #{companyid,jdbcType=INTEGER},
-      </if>
-      <if test="updaterId != null">
-        updaterId = #{updaterId,jdbcType=INTEGER},
-      </if>
-      <if test="updatedate != null">
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="rd_text1 != null">
-        rd_text1 = #{rd_text1,jdbcType=VARCHAR},
-      </if>
-      <if test="rd_text2 != null">
-        rd_text2 = #{rd_text2,jdbcType=VARCHAR},
-      </if>
-      <if test="rd_text3 != null">
-        rd_text3 = #{rd_text3,jdbcType=VARCHAR},
-      </if>
-      <if test="rd_text4 != null">
-        rd_text4 = #{rd_text4,jdbcType=VARCHAR},
-      </if>
-      <if test="rd_text5 != null">
-        rd_text5 = #{rd_text5,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where rd_id = #{rd_id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.money.po.Recbalancedet">
-    update recbalancedet
-    set rd_rbid = #{rd_rbid,jdbcType=INTEGER},
-      rd_detno = #{rd_detno,jdbcType=INTEGER},
-      rd_ym = #{rd_ym,jdbcType=INTEGER},
-      rd_bankid = #{rd_bankid,jdbcType=INTEGER},
-      rd_bankcode = #{rd_bankcode,jdbcType=VARCHAR},
-      rd_bankname = #{rd_bankname,jdbcType=VARCHAR},
-      rd_amount = #{rd_amount,jdbcType=DOUBLE},
-      rd_paymethod = #{rd_paymethod,jdbcType=VARCHAR},
-      rd_paycode = #{rd_paycode,jdbcType=VARCHAR},
-      rd_remark = #{rd_remark,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
-      updaterId = #{updaterId,jdbcType=INTEGER},
-      updatedate = #{updatedate,jdbcType=TIMESTAMP},
-      rd_text1 = #{rd_text1,jdbcType=VARCHAR},
-      rd_text2 = #{rd_text2,jdbcType=VARCHAR},
-      rd_text3 = #{rd_text3,jdbcType=VARCHAR},
-      rd_text4 = #{rd_text4,jdbcType=VARCHAR},
-      rd_text5 = #{rd_text5,jdbcType=VARCHAR}
-    where rd_id = #{rd_id,jdbcType=INTEGER}
-  </update>
+
 </mapper>

applications/pom.xml

@@ -15,8 +15,8 @@
     <modules>
         <module>purchase</module>
         <!--<module>sale</module>
-        <module>storage</module>
-        <module>money</module>-->
+        <module>storage</module>-->
+        <module>money</module>
         <module>document</module>
         <module>commons</module>
     </modules>

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/PurchaseController.java

@@ -4,7 +4,7 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
 
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
-import com.usoftchina.saas.commons.dto.DocSavedDTO;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.purchase.dto.*;
 import com.usoftchina.saas.purchase.po.PurchaseList;
@@ -57,9 +57,9 @@ public class PurchaseController {
      * @return
      */
     @PostMapping("/save")
-    public Result<DocSavedDTO> saveFormData(@RequestBody PurchaseFormDTO data) {
-        DocSavedDTO savedDTO = purchaseService.saveFormData(data);
-        return Result.success(savedDTO);
+    public Result<DocBaseDTO> saveFormData(@RequestBody PurchaseFormDTO data) {
+        DocBaseDTO save = purchaseService.saveFormData(data);
+        return Result.success(save);
 
     }
 
@@ -95,7 +95,7 @@ public class PurchaseController {
      */
     @PostMapping("/audit")
     public Result audit(@RequestBody PurchaseFormDTO formData) {
-        DocSavedDTO audit = purchaseService.audit(formData);
+        DocBaseDTO audit = purchaseService.audit(formData);
         return Result.success(audit);
     }
 

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/PurchaseMapper.java

@@ -26,4 +26,6 @@ public interface PurchaseMapper extends CommonBaseMapper<Purchase>{
     Integer validateCodeWhenInsert(String code);
 
     Integer validateCodeWhenUpdate(@Param("code") String code,@Param("id") Long id);
+
+    String selectCodeById(Long id);
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/PurchaseService.java

@@ -6,6 +6,7 @@ import com.usoftchina.saas.base.service.CommonBaseService;
 
 
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.DocSavedDTO;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.purchase.dto.PurchaseFormDTO;
@@ -49,7 +50,7 @@ public interface PurchaseService extends CommonBaseService<PurchaseMapper, Purch
      * @param formdata
      * @return
      */
-    DocSavedDTO saveFormData(PurchaseFormDTO formdata);
+    DocBaseDTO saveFormData(PurchaseFormDTO formdata);
 
     /**
      * 删除
@@ -73,7 +74,7 @@ public interface PurchaseService extends CommonBaseService<PurchaseMapper, Purch
      * @param formData
      * @return
      */
-    DocSavedDTO audit(PurchaseFormDTO formData);
+    DocBaseDTO audit(PurchaseFormDTO formData);
 
     /**
     * @Description 批量审核

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -5,9 +5,9 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.MaxnumberService;
+import com.usoftchina.saas.commons.api.MessageLogService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
-import com.usoftchina.saas.commons.dto.DocSavedDTO;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.exception.BizException;
@@ -51,6 +51,8 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     private ProdInOutMapper prodInOutMapper;
     @Autowired
     private ProdIODetailMapper prodIODetailMapper;
+    @Autowired
+    private MessageLogService messageLogService;
 
     @Override
     public PageInfo<PurchaseList> getListData(PageRequest page, PurchaseReqDTO req) {
@@ -84,7 +86,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     }
 
     @Override
-    public DocSavedDTO saveFormData(PurchaseFormDTO formdata) {
+    public DocBaseDTO saveFormData(PurchaseFormDTO formdata) {
         if (null == formdata || null == formdata.getMain()){
             throw new BizException(500, "数据为空，请填写后再保存");
         }
@@ -99,7 +101,8 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         List<PurchaseDetail> insertDetails = new ArrayList<>();
         //更新从表数据
         List<PurchaseDetail> updateDetails = new ArrayList<>();
-        DocSavedDTO saveDTO = new DocSavedDTO();
+        //返回对象
+        DocBaseDTO baseDTO = null;
         Long pu_id = main.getId();
         String pu_code = main.getPu_code();
         Purchase purchase = BeanMapper.map(main, Purchase.class);
@@ -110,7 +113,6 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         //编号校验
         pu_code = pushMaxnubmer(pu_code, pu_id);
         purchase.setPu_code(pu_code);
-        saveDTO.setCode(pu_code);
         //判断更新与保存动作
         if (StringUtils.isEmpty(pu_id) || "0".equals(pu_id.toString())) {
             //插入操作
@@ -128,8 +130,10 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
             if (insertDetails.size() > 0) {
                 purchasedetailMapper.batchInsert(insertDetails);
             }
-            saveDTO.setId(pu_id);
-            return saveDTO;
+            baseDTO = getBaseDTOById(pu_id);
+            //日志记录
+            messageLogService.save(baseDTO);
+            return baseDTO;
         }
         //更新操作
         purchaseMapper.updateByPrimaryKeySelective(purchase);
@@ -152,8 +156,10 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         if (updateDetails.size() > 0) {
             purchasedetailMapper.batchUpdate(updateDetails);
         }
-        saveDTO.setId(pu_id);
-        return saveDTO;
+        baseDTO = getBaseDTOById(pu_id);
+        //日志
+        messageLogService.save(baseDTO);
+        return baseDTO;
 
     }
 
@@ -164,23 +170,26 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
 
     @Override
     public int deleteDetail(Long id) {
-        return purchasedetailMapper.deleteByPrimaryKey(id);
+       Integer num = purchasedetailMapper.deleteByPrimaryKey(id);
+        DocBaseDTO docBaseDTO = getBaseDTOById(id);
+        //日志
+        messageLogService.deleteDetail(docBaseDTO);
+        return num;
     }
 
     @Override
-    public DocSavedDTO audit(PurchaseFormDTO formData) {
+    public DocBaseDTO audit(PurchaseFormDTO formData) {
         Long id = null;
-        DocSavedDTO savedDTO = new DocSavedDTO();
+        DocBaseDTO baseDTO = null;
         if (null != formData) {
             id = formData.getMain().getId();
             if (StringUtils.isEmpty(id) || "0".equals(String.valueOf(id))) {
-                DocSavedDTO saveDTO = saveFormData(formData);
-                id = saveDTO.getId();
+                baseDTO = saveFormData(formData);
+                id = baseDTO.getId();
             }
             singleAudit(id);
         }
-        savedDTO.setId(id);
-        return savedDTO;
+        return baseDTO;
     }
 
     @Override
@@ -246,6 +255,9 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         purchase.setPu_acceptstatuscode("CLOSED");
         purchase.setPu_acceptstatus("已关闭");
         purchaseMapper.updateByPrimaryKeySelective(purchase);
+        DocBaseDTO docBaseDTO = getBaseDTOById(id);
+        //日志
+        messageLogService.close(docBaseDTO);
     }
 
     @Override
@@ -277,6 +289,9 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 purchase.setPu_acceptstatuscode("TURNIN");
             }
             purchaseMapper.updateByPrimaryKeySelective(purchase);
+            DocBaseDTO docBaseDTO = getBaseDTOById(id);
+            //日志
+            messageLogService.open(docBaseDTO);
         }
     }
 
@@ -378,6 +393,9 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         purchaseMapper.updateByPrimaryKeySelective(purchase);
         //更新最新采购单价
         //productApi.updateLatestPurchasePrice(id);
+        DocBaseDTO docBaseDTO = getBaseDTOById(id);
+        //日志
+        messageLogService.audit(docBaseDTO);
     }
 
     private void singleUnAudit(Long id) {
@@ -390,6 +408,9 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         purchase.setUpdaterId(BaseContextHolder.getUserId());
         //更新存在字段
         purchaseMapper.updateByPrimaryKeySelective(purchase);
+        DocBaseDTO docBaseDTO = getBaseDTOById(id);
+        //日志
+        messageLogService.unAudit(docBaseDTO);
     }
 
     private void singleDelete(Long id) {
@@ -398,6 +419,9 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
             purchasedetailMapper.deleteByForeignKey(id);
             //主表删除
             purchaseMapper.deleteByPrimaryKey(id);
+            DocBaseDTO docBaseDTO = getBaseDTOById(id);
+            //日志
+            messageLogService.delete(docBaseDTO);
         }
     }
 
@@ -426,4 +450,23 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 purchaseMapper.validateCodeWhenUpdate(code, id);
         return maxnumberService.pushMaxnubmer(count, code, "Purchase");
     }
+    
+    /** 
+    * @Description
+    * @Param: [id]
+    * @return: com.usoftchina.saas.commons.dto.DocBaseDTO 
+    * @Author: guq
+    * @Date: 2018/10/22 
+    */
+    private DocBaseDTO getBaseDTOById(Long id) {
+        if (null == id) {
+            return null;
+        }
+        String code = purchaseMapper.selectCodeById(id);
+        DocBaseDTO baseDTO = new DocBaseDTO();
+        baseDTO.setId(id);
+        baseDTO.setCode(code);
+        baseDTO.setName("Purchase");
+        return baseDTO;
+    }
 }

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseMapper.xml

@@ -419,4 +419,7 @@
   <select id="validateCodeWhenUpdate" resultType="int" >
     select count(1) from purchase where pu_code = #{code} and pu_id != #{id}
   </select>
+  <select id="selectCodeById" resultType="string" parameterType="long">
+    select pu_code from pu_id=#{id}
+  </select>
 </mapper>

base-servers/eureka-server/src/main/resources/config/application-docker-dev.yml

@@ -0,0 +1,5 @@
+eureka:
+  instance:
+    hostname: saas-eureka-server-dev
+server:
+  port: 8510

base-servers/eureka-server/src/main/resources/logback-spring.xml

@@ -103,4 +103,10 @@
         </root>
     </springProfile>
 
+    <springProfile name="docker-dev">
+        <root level="INFO">
+            <appender-ref ref="CONSOLE_APPENDER"/>
+        </root>
+    </springProfile>
+
 </configuration>

base-servers/gateway-server/src/main/resources/config/application-docker-dev.yml

@@ -0,0 +1,12 @@
+eureka:
+  instance:
+    hostname: saas-gateway-server-dev
+    prefer-ip-address: false
+  client:
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server-dev:8510/eureka/
+spring:
+  rabbitmq:
+    virtual-host: dev
+server:
+  port: 8570

base-servers/gateway-server/src/main/resources/logback-spring.xml

@@ -103,4 +103,10 @@
         </root>
     </springProfile>
 
+    <springProfile name="docker-dev">
+        <root level="INFO">
+            <appender-ref ref="CONSOLE_APPENDER"/>
+        </root>
+    </springProfile>
+
 </configuration>

base-servers/ui-server/src/main/resources/config/application-docker-dev.yml

@@ -0,0 +1,12 @@
+eureka:
+  instance:
+    hostname: saas-ui-server-dev
+    prefer-ip-address: false
+  client:
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server-dev:8510/eureka/
+spring:
+  rabbitmq:
+    virtual-host: dev
+server:
+  port: 8630

base-servers/ui-server/src/main/resources/logback-spring.xml

@@ -103,4 +103,10 @@
         </root>
     </springProfile>
 
+    <springProfile name="docker-dev">
+        <root level="INFO">
+            <appender-ref ref="CONSOLE_APPENDER"/>
+        </root>
+    </springProfile>
+
 </configuration>

frontend/saas-web/Dockerfile

@@ -0,0 +1,5 @@
+FROM hub.c.163.com/library/nginx
+MAINTAINER USOFTCHINA <yingp@usoftchina.com>
+RUN rm /etc/nginx/conf.d/default.conf
+ADD runtime/nginx/default.conf /etc/nginx/conf.d/
+COPY build/production/saas/ /usr/share/nginx/html/

frontend/saas-web/app/view/auth/Login.js

@@ -36,8 +36,7 @@ Ext.define('saas.view.auth.Login', {
             },
             items: [
                 {
-                    xtype: 'label',
-                    text: '账户登录'
+                    html: '账 户 登 录'
                 },
                 {
                     xtype: 'textfield',

frontend/saas-web/runtime/nginx/default.conf

@@ -0,0 +1,20 @@
+server {
+    listen       80;
+    server_name  localhost;
+
+    charset utf-8;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+    }
+
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   html;
+    }
+}