修改实体类

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesAccountServiceImpl.java

@@ -73,6 +73,7 @@ public class ActSuppliesAccountServiceImpl implements IActSuppliesAccountService
             String nameZhCn = AuxiliaryAccRuleHandler.handleAuxiliaryAccounting(dispensing.getMining(), dispensing.getName());
             String displayName = AccSubjectReqParamHandler.paramHandler(dispensing.getName(), dispensing.getMaterial(), dispensing.getDepartment());
             JSONObject accRes = getCellByName(displayName, accSubjects);
+            if (accRes == null) continue;
             dispensing.setAccountingCode(accRes.getString("code"));
             JSONArray res = accRes.getJSONArray("res");
             String dispensingDepartment = dispensing.getDepartment();
@@ -134,7 +135,9 @@ public class ActSuppliesAccountServiceImpl implements IActSuppliesAccountService
     
     public JSONObject getCellByName(String filterNameZHCN, JSONObject accSubjects) {
         JSONObject cell = getAccSubject(accSubjects, filterNameZHCN);
-        assert cell != null;
+        if (filterNameZHCN == null || "".equals(filterNameZHCN) || cell == null || cell.size() == 0){
+            return null;
+        }
         if ("专项储备_煤炭生产安全费_本年减少_费用性支出".equals(filterNameZHCN) || "研发支出_费用化支出_材料及低值易耗品".equals(filterNameZHCN) || "在建工程_内部投资工程".equals(filterNameZHCN))
             return filterBodiesWithSpecified(cell);
         return filterBodiesWithExtNameEnding(cell);

ruoyi-wages/src/main/java/com/ruoyi/system/controller/WagesCalculateConversionController.java

+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.model.wages.dto.WagesFormulaListDto;
+import com.ruoyi.system.service.WagesCalculateConversionService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 2024/5/21
+ */
+@RestController
+@RequestMapping("/wages/calculate")
+public class WagesCalculateConversionController {
+    private WagesCalculateConversionService wagesCalculateConversionService;
+    private WagesCalculateConversionController(WagesCalculateConversionService wagesCalculateConversionService){
+        this.wagesCalculateConversionService = wagesCalculateConversionService;
+    }
+    /**
+     * 唐山矿转换表
+     */
+    @RequestMapping("/surface")
+    public AjaxResult conversionSurface(@RequestParam("")WagesFormulaListDto wagesFormulaListDto) {
+        return new AjaxResult(200, "成功", wagesCalculateConversionService.conversionSurface(wagesFormulaListDto));
+    }
+}

ruoyi-wages/src/main/java/com/ruoyi/system/controller/WagesConversionController.java

@@ -50,7 +50,7 @@ public class WagesConversionController extends BaseController {
     }
     
     @GetMapping("/getWagesDataById/{id}")
-    public WagesConversionData getWagesDataById(@PathVariable("id") int id) {
-        return wagesConversionService.selectWagesConversionDataById(id);
+    public AjaxResult getWagesDataById(@PathVariable("id") int id) {
+        return new AjaxResult(200, "成功", wagesConversionService.selectWagesConversionDataById(id));
     }
 }

ruoyi-wages/src/main/java/com/ruoyi/system/mapper/WagesMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.mapper;
 
 import com.ruoyi.system.model.wages.dao.WagesDetailsOriginalExcelDAO;
 import com.ruoyi.system.model.wages.dao.WagesOverviewOriginalExcelDAO;
+import com.ruoyi.system.model.wages.dao.WagesSalaryProof;
 import com.ruoyi.system.model.wages.vo.WagesOverviewOriginalDataVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

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

+package com.ruoyi.system.model.wages.dao;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * @author LZZ
+ * @date 2024/5/16
+ */
+public class WagesSalaryProof extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+    
+    private int id;
+    
+    private String abStract;
+    
+    private String sourceOfExpenses;
+    
+    private String isDebit;
+    
+    private String accountName;
+    
+    private String accountCode;
+
+    private String auxiliaryItemA;
+
+    private String auxiliaryItemB;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getAbStract() {
+        return abStract;
+    }
+
+    public void setAbStract(String abStract) {
+        this.abStract = abStract;
+    }
+
+    public String getSourceOfExpenses() {
+        return sourceOfExpenses;
+    }
+
+    public void setSourceOfExpenses(String sourceOfExpenses) {
+        this.sourceOfExpenses = sourceOfExpenses;
+    }
+
+    public String getIsDebit() {
+        return isDebit;
+    }
+
+    public void setIsDebit(String isDebit) {
+        this.isDebit = isDebit;
+    }
+
+    public String getAccountName() {
+        return accountName;
+    }
+
+    public void setAccountName(String accountName) {
+        this.accountName = accountName;
+    }
+
+    public String getAccountCode() {
+        return accountCode;
+    }
+
+    public void setAccountCode(String accountCode) {
+        this.accountCode = accountCode;
+    }
+
+    public String getAuxiliaryItemA() {
+        return auxiliaryItemA;
+    }
+
+    public void setAuxiliaryItemA(String auxiliaryItemA) {
+        this.auxiliaryItemA = auxiliaryItemA;
+    }
+
+    public String getAuxiliaryItemB() {
+        return auxiliaryItemB;
+    }
+
+    public void setAuxiliaryItemB(String auxiliaryItemB) {
+        this.auxiliaryItemB = auxiliaryItemB;
+    }
+
+    @Override
+    public String toString() {
+        return "WagesSalaryProof{" +
+                "id=" + id +
+                ", abStract='" + abStract + '\'' +
+                ", sourceOfExpenses='" + sourceOfExpenses + '\'' +
+                ", isDebit='" + isDebit + '\'' +
+                ", accountName='" + accountName + '\'' +
+                ", accountCode='" + accountCode + '\'' +
+                ", auxiliaryItemA='" + auxiliaryItemA + '\'' +
+                ", auxiliaryItemB='" + auxiliaryItemB + '\'' +
+                '}';
+    }
+}

ruoyi-wages/src/main/java/com/ruoyi/system/model/wages/dto/WagesFormulaDto.java

+package com.ruoyi.system.model.wages.dto;
+
+/**
+ * 2024/5/21
+ */
+public class WagesFormulaDto {
+    // 页面展示字段
+    private String label;
+    // 列数
+    private String c;
+    // 公式
+    private String value;
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getC() {
+        return c;
+    }
+
+    public void setC(String c) {
+        this.c = c;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

ruoyi-wages/src/main/java/com/ruoyi/system/model/wages/dto/WagesFormulaListDto.java

+package com.ruoyi.system.model.wages.dto;
+
+import java.util.List;
+
+/**
+ * 2024/5/21
+ * 唐山矿转换表公式接收
+ */
+public class WagesFormulaListDto {
+    // 日期
+    private String date;
+    private List<WagesFormulaDto> wagesFormulaDtoList;
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public List<WagesFormulaDto> getWagesFormulaDtoList() {
+        return wagesFormulaDtoList;
+    }
+
+    public void setWagesFormulaDtoList(List<WagesFormulaDto> wagesFormulaDtoList) {
+        this.wagesFormulaDtoList = wagesFormulaDtoList;
+    }
+}

ruoyi-wages/src/main/java/com/ruoyi/system/model/wages/vo/WagesFormulaListVo.java

+package com.ruoyi.system.model.wages.vo;
+
+import java.util.List;
+
+/**
+ * 2024/5/22
+ */
+public class WagesFormulaListVo {
+    // 部门
+    private String dep;
+    private List<WagesFormulaVo> list;
+
+    public String getDep() {
+        return dep;
+    }
+
+    public void setDep(String dep) {
+        this.dep = dep;
+    }
+
+    public List<WagesFormulaVo> getList() {
+        return list;
+    }
+
+    public void setList(List<WagesFormulaVo> list) {
+        this.list = list;
+    }
+}

ruoyi-wages/src/main/java/com/ruoyi/system/model/wages/vo/WagesFormulaVo.java

+package com.ruoyi.system.model.wages.vo;
+
+/**
+ * 2024/5/22
+ */
+public class WagesFormulaVo {
+    // 页面展示字段
+    private String label;
+    // 列数
+    private String c;
+    // 值
+    private String value;
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getC() {
+        return c;
+    }
+
+    public void setC(String c) {
+        this.c = c;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

ruoyi-wages/src/main/java/com/ruoyi/system/service/WagesCalculateConversionService.java

+package com.ruoyi.system.service;
+
+import com.ruoyi.system.model.wages.dto.WagesFormulaListDto;
+
+/**
+ * 2024/5/21
+ */
+public interface WagesCalculateConversionService {
+    Object conversionSurface(WagesFormulaListDto wagesFormulaListDto);
+}

ruoyi-wages/src/main/java/com/ruoyi/system/service/WagesService.java

 package com.ruoyi.system.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.system.model.wages.dao.WagesDetailsOriginalExcelDAO;
+import com.ruoyi.system.model.wages.dao.WagesSalaryProof;
 import com.ruoyi.system.model.wages.vo.WagesOverviewOriginalDataVO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 2024/4/27
@@ -15,4 +18,6 @@ public interface WagesService {
     List<WagesOverviewOriginalDataVO> getSalaryList();
 
     List<WagesDetailsOriginalExcelDAO> details();
+
+    JSONObject selectWagesVoucherList(String s);
 }

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

+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.model.wages.dto.WagesFormulaListDto;
+import com.ruoyi.system.service.WagesCalculateConversionService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 2024/5/21
+ */
+@Service
+public class WagesCalculateConversionServiceImpl implements WagesCalculateConversionService {
+
+    @Override
+    public Object conversionSurface(WagesFormulaListDto wagesFormulaListDto) {
+
+        return null;
+    }
+}

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

 package com.ruoyi.system.service.impl;
 
 import com.alibaba.excel.EasyExcelFactory;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.system.listener.ExcelListener;
 import com.ruoyi.system.mapper.WagesMapper;
-import com.ruoyi.system.model.wages.dao.WagesDetailsOriginalExcelDAO;
-import com.ruoyi.system.model.wages.dao.WagesDetailsOriginalExcelSheet1DAO;
-import com.ruoyi.system.model.wages.dao.WagesDetailsOriginalExcelSheet2DAO;
-import com.ruoyi.system.model.wages.dao.WagesOverviewOriginalExcelDAO;
+import com.ruoyi.system.mapper.WagesSalaryProofMapper;
+import com.ruoyi.system.model.wages.dao.*;
 import com.ruoyi.system.model.wages.vo.WagesOverviewOriginalDataVO;
 import com.ruoyi.system.service.WagesService;
 import org.slf4j.Logger;
@@ -20,6 +21,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -30,6 +32,8 @@ public class WagesServiceImpl implements WagesService {
     private Logger logger = LoggerFactory.getLogger(WagesServiceImpl.class);
     @Autowired
     WagesMapper wagesMapper;
+    @Autowired
+    WagesSalaryProofMapper wagesSalaryProofMapper;
     @Transactional
     @Override
     public String readOriginalData(MultipartFile file) {
@@ -86,4 +90,71 @@ public class WagesServiceImpl implements WagesService {
     public List<WagesDetailsOriginalExcelDAO> details() {
         return wagesMapper.detailsSelect();
     }
+
+    @Override
+    public JSONObject selectWagesVoucherList(String ss) {
+        JSONObject object = new JSONObject();
+        //List<WagesSalaryProof>  borrowlists = new ArrayList<>();
+        JSONArray borrowlists = new JSONArray();
+        //List<WagesSalaryProof>  loanlists = new ArrayList<>();
+        JSONArray  loanlists = new JSONArray();
+        JSONObject jsonObject = JSON.parseObject(ss);
+        JSONArray borrow = jsonObject.getJSONArray("borrow");
+        JSONArray loan = jsonObject.getJSONArray("loan");
+        for (int i = 0; i < borrow.size(); i++) {
+            JSONObject jsonObject1 = borrow.getJSONObject(i);
+            String abStract = jsonObject1.getString("classary");
+            String sourceOfExpenses = jsonObject1.getString("name");
+            String isDebit = jsonObject1.getString("is_debit");
+
+            WagesSalaryProof wagesSalaryProof = new WagesSalaryProof();
+            wagesSalaryProof.setAbStract(abStract);
+            wagesSalaryProof.setSourceOfExpenses(sourceOfExpenses);
+            wagesSalaryProof.setIsDebit(isDebit);
+            WagesSalaryProof wagesSalaryProof1 = wagesSalaryProofMapper.selectWagesVoucherList(wagesSalaryProof);
+
+//            wagesSalaryProof.setAccountCode(wagesSalaryProof1.getAccountCode());
+//            wagesSalaryProof.setAuxiliaryItemA(wagesSalaryProof1.getAuxiliaryItemA());
+//            wagesSalaryProof.setAuxiliaryItemB(wagesSalaryProof1.getAuxiliaryItemB());
+            //borrowlists.add(wagesSalaryProof);
+            if(wagesSalaryProof1 != null){
+                System.err.println("wagesSalaryProof1====" + wagesSalaryProof1.toString() + i);
+                jsonObject1.put("account_code",wagesSalaryProof1.getAccountCode());
+                jsonObject1.put("auxiliary_item_a",wagesSalaryProof1.getAuxiliaryItemA());
+                jsonObject1.put("auxiliary_item_b",wagesSalaryProof1.getAuxiliaryItemB());
+            }
+
+            borrowlists.add(jsonObject1);
+        }
+        for (int i = 0; i < loan.size(); i++) {
+            JSONObject jsonObject2 = loan.getJSONObject(i);
+            String abStract = jsonObject2.getString("classary");
+            String sourceOfExpenses = jsonObject2.getString("name");
+            String isDebit = jsonObject2.getString("is_debit");
+            WagesSalaryProof wagesSalaryProof = new WagesSalaryProof();
+            wagesSalaryProof.setAbStract(abStract);
+            wagesSalaryProof.setSourceOfExpenses(sourceOfExpenses);
+            wagesSalaryProof.setIsDebit(isDebit);
+            WagesSalaryProof wagesSalaryProof2 = wagesSalaryProofMapper.selectWagesVoucherList(wagesSalaryProof);
+
+//            wagesSalaryProof.setAccountCode(wagesSalaryProof1.getAccountCode());
+//            wagesSalaryProof.setAuxiliaryItemA(wagesSalaryProof1.getAuxiliaryItemA());
+//            wagesSalaryProof.setAuxiliaryItemB(wagesSalaryProof1.getAuxiliaryItemB());
+//            loanlists.add(wagesSalaryProof);
+            if(wagesSalaryProof2 != null){
+                System.err.println("wagesSalaryProof2====" + wagesSalaryProof2.toString() + i);
+                jsonObject2.put("account_code",wagesSalaryProof2.getAccountCode());
+                jsonObject2.put("auxiliary_item_a",wagesSalaryProof2.getAuxiliaryItemA());
+                jsonObject2.put("auxiliary_item_b",wagesSalaryProof2.getAuxiliaryItemB());
+            }
+
+            loanlists.add(jsonObject2);
+        }
+
+//        com.alibaba.fastjson2.JSONArray borrowjson = com.alibaba.fastjson2.JSONArray.of(borrowlists);
+//        com.alibaba.fastjson2.JSONArray loanjson = com.alibaba.fastjson2.JSONArray.of(loanlists);
+        object.put("borrow",borrowlists);
+        object.put("loan",loanlists);
+        return object;
+    }
 }

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

@@ -19,7 +19,7 @@
     </insert>
 
     <select id="selectWagesConversionDataList" resultMap="WagesConversionData">
-        select id , json_data, if_generate_voucher , wage_month ,create_date , update_date
+        select id, if_generate_voucher , wage_month ,create_date , update_date
         from wages_conversion_data
         where
             if_generate_voucher = 0

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

@@ -3,6 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.WagesMapper">
+
     <insert id="insertDetailsOriginal">
         insert into wages_details_original_data (year, month, unit_name, people_count, total_withholding,
         net_salary, one_child_fee, medical_subsidy, health_care_fee, class_meal_fee, soap_fee, nursing_fee,

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

+<?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.ruoyi.system.mapper.WagesSalaryProofMapper">
+
+    <resultMap type="com.ruoyi.system.model.wages.dao.WagesSalaryProof" id="WagesSalaryProofResult">
+        <id     property="id"       column="id"      />
+        <result property="abStract"       column="abstract"      />
+        <result property="sourceOfExpenses"     column="source_of_expenses"    />
+        <result property="isDebit"     column="is_debit"    />
+        <result property="accountName"        column="account_name"        />
+        <result property="accountCode"  column="account_code"  />
+        <result property="auxiliaryItemA"          column="auxiliary_item_a"          />
+        <result property="auxiliaryItemB"       column="auxiliary_item_b"       />
+
+    </resultMap>
+
+    <select id="selectWagesVoucherList" parameterType="com.ruoyi.system.model.wages.dao.WagesSalaryProof" resultMap="WagesSalaryProofResult">
+        select
+        TRIM(id)id,
+        TRIM(abstract)abstract,
+        TRIM(source_of_expenses)source_of_expenses,
+        TRIM(is_debit)is_debit,
+        TRIM(account_name)account_name,
+        TRIM(account_code)account_code,
+        TRIM(auxiliary_item_a)auxiliary_item_a,
+        TRIM(auxiliary_item_b) auxiliary_item_b
+        from wages_voucher
+        where 1=1
+        <if test="abStract != null and abStract != ''">
+            AND abstract = #{abStract}
+        </if>
+        <if test="sourceOfExpenses != null and sourceOfExpenses != ''">
+            AND source_of_expenses = #{sourceOfExpenses}
+        </if>
+        <if test="isDebit != null and isDebit != ''">
+            AND is_debit = #{isDebit}
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file