Merge remote-tracking branch 'origin/master'

ruoyi-wages/src/main/java/com/ruoyi/system/model/wages/dao/WagesSalaryProof.java

@@ -26,6 +26,8 @@ public class WagesSalaryProof extends BaseEntity {
 
     private String auxiliaryItemB;
 
+    private String auxiliaryItemC;
+
     private String mineId;//矿ID
 
     public int getId() {
@@ -92,6 +94,14 @@ public class WagesSalaryProof extends BaseEntity {
         this.auxiliaryItemB = auxiliaryItemB;
     }
 
+    public String getAuxiliaryItemC() {
+        return auxiliaryItemC;
+    }
+
+    public void setAuxiliaryItemC(String auxiliaryItemC) {
+        this.auxiliaryItemC = auxiliaryItemC;
+    }
+
     public String getMineId() {
         return mineId;
     }
@@ -111,7 +121,8 @@ public class WagesSalaryProof extends BaseEntity {
                 ", accountCode='" + accountCode + '\'' +
                 ", auxiliaryItemA='" + auxiliaryItemA + '\'' +
                 ", auxiliaryItemB='" + auxiliaryItemB + '\'' +
-                ", mineId='" +  mineId + '\'' +
+                ", auxiliaryItemC='" + auxiliaryItemC + '\'' +
+                ", mineId='" + mineId + '\'' +
                 '}';
     }
 }

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesServiceImpl.java

@@ -148,6 +148,7 @@ public class WagesServiceImpl implements WagesService {
                     jsonObject1.put("account_code", wagesSalaryProof1.getAccountCode());
                     jsonObject1.put("auxiliary_item_a", wagesSalaryProof1.getAuxiliaryItemA());
                     jsonObject1.put("auxiliary_item_b", wagesSalaryProof1.getAuxiliaryItemB());
+                    jsonObject1.put("auxiliary_item_c", wagesSalaryProof1.getAuxiliaryItemC());
                 } else {
                     //如果项目带前带（，去获取相似项目的值
                     if (sourceOfExpenses.startsWith("(") || sourceOfExpenses.startsWith("（")) {
@@ -161,6 +162,7 @@ public class WagesServiceImpl implements WagesService {
                             WagesSalaryProof WagesSalaryProof3 = wagesSalaryProofsList.get(0);
                             jsonObject1.put("account_code", WagesSalaryProof3.getAccountCode());
                             jsonObject1.put("auxiliary_item_a", WagesSalaryProof3.getAuxiliaryItemA());
+                            jsonObject1.put("auxiliary_item_c", WagesSalaryProof3.getAuxiliaryItemC());
                             int index = sourceOfExpenses.indexOf(")");
                             if (index == -1) {
                                 index = sourceOfExpenses.indexOf("）");

ruoyi-wages/src/main/resources/mapper/system/WagesSalaryProofMapper.xml

@@ -13,6 +13,7 @@
         <result property="accountCode"  column="account_code"  />
         <result property="auxiliaryItemA"          column="auxiliary_item_a"          />
         <result property="auxiliaryItemB"       column="auxiliary_item_b"       />
+        <result property="auxiliaryItemC"       column="auxiliary_item_c"       />
         <result property="mineId"       column="mine_id"       />
 
     </resultMap>
@@ -27,6 +28,7 @@
         TRIM(account_code)account_code,
         TRIM(auxiliary_item_a)auxiliary_item_a,
         TRIM(auxiliary_item_b) auxiliary_item_b,
+        TRIM(auxiliary_item_c) auxiliary_item_c,
         TRIM(mine_id)mine_id
         from wages_voucher
         where 1=1
@@ -54,6 +56,7 @@
         TRIM(account_code)account_code,
         TRIM(auxiliary_item_a)auxiliary_item_a,
         TRIM(auxiliary_item_b) auxiliary_item_b,
+        TRIM(auxiliary_item_c) auxiliary_item_c,
         TRIM(mine_id)mine_id
         from wages_voucher
         where 1=1