同步主体增加体系

cost-service/src/main/java/com/blt/other/database/model/CostCompanyDomain.java

@@ -53,4 +53,7 @@ public class CostCompanyDomain {
     @TableField(exist = false)
     private String codeName;
 
+    @ApiModelProperty("体系")
+    private String companySystem;
+
 }

cost-service/src/main/java/com/blt/other/module/cost/service/impl/CostCompanyServiceImpl.java

@@ -65,13 +65,14 @@ public class CostCompanyServiceImpl extends ServiceImpl<CostCompanyDao, CostComp
                 companyDomain = new CostCompanyDomain();
                 companyDomain.setValue(companyVo.getValue());
                 companyDomain.setCompanyName(companyVo.getName());
+                companyDomain.setCompanySystem(companyVo.getCompanySystem());
                 List<CostCompanyDomain> costCompanyDomains = costCompanyDao.selectByNameOrValue(companyDomain);
                 if (null != costCompanyDomains && costCompanyDomains.size() >= 1) {
                     // 如果表中已存在相同名称的主体，则 update（根据 companyNo）
                     String companyNo = costCompanyDomains.get(0).getCompanyNo();
                     companyDomain.setCompanyNo(companyNo);
                     if (isUpdate(costCompanyDomains.get(0), companyDomain)) {
-                        companyDomain.setCompanyNo(companyVo.getCodeName());
+                        //companyDomain.setCompanyNo(companyVo.getCodeName());
                         Integer Integer = costCompanyDao.update(companyDomain);
                         update += Integer;
                         if (Integer >= 1) {
@@ -294,9 +295,11 @@ public class CostCompanyServiceImpl extends ServiceImpl<CostCompanyDao, CostComp
     private boolean isUpdate(CostCompanyDomain exited, CostCompanyDomain forInsert) {
         String companyName = exited.getCompanyName();
         Integer value = exited.getValue();
+        String companySystem = exited.getCompanySystem();
         String companyName1 = forInsert.getCompanyName();
         Integer value1 = forInsert.getValue();
-        if (("" + companyName).equals("" + companyName1) && value == value1) {
+        String companySystem1 = forInsert.getCompanySystem();
+        if (("" + companyName).equals("" + companyName1) && value == value1 && ("" + companySystem).equals("" + companySystem1) ) {
             return false;
         }
         return true;

cost-service/src/main/java/com/blt/other/module/purchasing/vo/CompanyVo.java

@@ -20,5 +20,6 @@ public class CompanyVo {
     private String modifyusername;
     private String modifytime;
     private String codeName;
+    private String companySystem;
 
 }

cost-service/src/main/resources/mapper/CostCompanyMapper.xml

@@ -3,10 +3,10 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.blt.other.module.cost.dao.CostCompanyDao">
     <insert id="insertCompany" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        INSERT INTO cost_company(company_no, company_name, value)
+        INSERT INTO cost_company(company_no, company_name, value, company_system)
             VALUE
             (
-             #{companyNo}, #{companyName}, #{value}
+             #{companyNo}, #{companyName}, #{value}, #{companySystem}
                 )
     </insert>
     <select id="selectByValue" resultType="com.blt.other.database.model.CostCompanyDomain">
@@ -36,7 +36,8 @@
         cost_company
         <set>
             <if test="companyName != null">company_name=#{companyName},</if>
-            <if test="value != null">value=#{value}</if>
+            <if test="value != null">value=#{value},</if>
+            <if test="companySystem != null">company_system=#{companySystem}</if>
         </set>
         WHERE
         company_no = #{companyNo}