Merge branch 'master' of http://192.168.111.222:3000/hehongwei/klck

ruoyi-admin/src/main/resources/application.yml

@@ -140,12 +140,14 @@ xss:
 # 用友接口地址
 
   #Production environment by nql at 20231101
-  #open-api.url=https://bip.kailuan.com.cn/iuap-api-auth
-  #app.key=51501a886f9140e9aff543dfe372c326
-  #app.secret=5d6e5559d2b713afb3de56972453559b608fba7c
-  #httpurl=https://bip.kailuan.com.cn/iuap-api-gateway/yonbip/qyjx/queryData/externalQuery?access_token=
-  #token.url=https://bip.kailuan.com.cn/iuap-api-auth/open-auth/selfAppAuth/getAccessToken
-  #api.url=https://bip.kailuan.com.cn/iuap-api-gateway
+
+#config:
+#  appKey: 51501a886f9140e9aff543dfe372c326
+#  secret: 5d6e5559d2b713afb3de56972453559b608fba7c
+#  openApiUrl: https://bip.kailuan.com.cn/iuap-api-auth
+#  apiurl: https://bip.kailuan.com.cn/iuap-api-gateway
+#  httpurl: https://bip.kailuan.com.cn/iuap-api-gateway/yonbip/qyjx/queryData/externalQuery?access_token=
+#  token.url: https://bip.kailuan.com.cn/iuap-api-auth/open-auth/selfAppAuth/getAccessToken
 
 
 

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

@@ -47,8 +47,8 @@ public class WagesController {
      * @return
      */
     @PostMapping("/excel")
-    public AjaxResult excelAnalysis(@RequestParam("file") MultipartFile file) {
-        String s = wagesService.readOriginalData(file);
+    public AjaxResult excelAnalysis(@RequestParam("file") MultipartFile file, @RequestParam("date")String date) {
+        String s = wagesService.readOriginalData(file, date);
         new AjaxResult();
         return new AjaxResult(200, s);
     }
@@ -69,7 +69,7 @@ public class WagesController {
      * @return
      */
     @RequestMapping("/details")
-    public List<WagesDetailsOriginalExcelDAO> test(){
+    public List<WagesDetailsOriginalExcelDAO> details(){
         List<WagesDetailsOriginalExcelDAO> list = wagesService.details();
         return list;
     }

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

@@ -15,9 +15,9 @@ import java.util.List;
 @Repository
 public interface WagesMapper {
 
-    void insertDetailsOriginal(@Param("accList") List<WagesDetailsOriginalExcelDAO> wagesDetList);
+    void insertDetailsOriginal(@Param("accList") List<WagesDetailsOriginalExcelDAO> wagesDetList, @Param("date") String date);
 
-    void insertWagesOverviewOriginal(@Param("accList") List<WagesOverviewOriginalExcelDAO> wagesOveList);
+    void insertWagesOverviewOriginal(@Param("accList") List<WagesOverviewOriginalExcelDAO> wagesOveList, @Param("date") String date);
 
     List<WagesOverviewOriginalDataVO> queryList();
 
@@ -26,4 +26,8 @@ public interface WagesMapper {
     void deleteDetailsOriginal(@Param("month") String month, @Param("year") String year);
 
     void deleteWagesOverviewOriginal(@Param("month") String month, @Param("year") String year);
+
+    void deleteOverviewToDate(@Param("date") String date);
+
+    void deleteDetailsToDate(@Param("date") String date);
 }

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

@@ -18,64 +18,75 @@ public class WagesConversionData {
     private Date updateTime;
     
     private String yearMonth;
-    
+
+    private String value;
+
     @Override
-    public String toString() {
+    public String  toString() {
         return "WagesConversionData{" +
-                "id='" + id + '\'' +
-                ", jsonData=" + jsonData +
+                "id=" + id +
+                ", jsonData='" + jsonData + '\'' +
                 ", ifGenerateVoucher='" + ifGenerateVoucher + '\'' +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", yearMonth='" + yearMonth + '\'' +
+                ", value='" + value + '\'' +
                 '}';
     }
-    
+
     public int getId() {
         return id;
     }
-    
+
     public void setId(int id) {
         this.id = id;
     }
-    
+
     public String getJsonData() {
         return jsonData;
     }
-    
+
     public void setJsonData(String jsonData) {
         this.jsonData = jsonData;
     }
-    
+
     public String getIfGenerateVoucher() {
         return ifGenerateVoucher;
     }
-    
+
     public void setIfGenerateVoucher(String ifGenerateVoucher) {
         this.ifGenerateVoucher = ifGenerateVoucher;
     }
-    
+
     public Date getCreateTime() {
         return createTime;
     }
-    
+
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    
+
     public Date getUpdateTime() {
         return updateTime;
     }
-    
+
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    
+
     public String getYearMonth() {
         return yearMonth;
     }
-    
+
     public void setYearMonth(String yearMonth) {
         this.yearMonth = yearMonth;
     }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
 }

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

 package com.ruoyi.system.model.wages.vo;
 
-import com.fasterxml.jackson.databind.JsonNode;
-
 /**
  * @author xyx
  * @date 2024/5/13

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

@@ -13,7 +13,7 @@ import java.util.Map;
  * 2024/4/27
  */
 public interface WagesService {
-    String readOriginalData(MultipartFile file);
+    String readOriginalData(MultipartFile file, String date);
 
     List<WagesOverviewOriginalDataVO> getSalaryList();
 

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

 package com.ruoyi.system.service.impl;
 
-import com.google.common.collect.Lists;
-
 import com.ruoyi.system.mapper.WagesDetailsOriginalDataMapper;
 import com.ruoyi.system.mapper.WagesOverviewOriginalDateMapper;
 import com.ruoyi.system.model.wages.dao.WagesDetailsOriginalExcelDAO;
@@ -14,11 +12,9 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 

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

@@ -35,11 +35,13 @@ public class WagesServiceImpl implements WagesService {
     WagesSalaryProofMapper wagesSalaryProofMapper;
     @Transactional
     @Override
-    public String readOriginalData(MultipartFile file) {
+    public String readOriginalData(MultipartFile file, String date) {
         try {
 //            if (Test.put("工资导入", "1")){
 //                return "不可重复点击";
 //            }
+            wagesMapper.deleteOverviewToDate(date);
+            wagesMapper.deleteDetailsToDate(date);
             InputStream inputStream1 = file.getInputStream();
             List<WagesDetailsOriginalExcelSheet1DAO> wagesDetSheet1List = EasyExcelFactory.read(inputStream1, WagesDetailsOriginalExcelSheet1DAO.class, new ExcelListener<WagesDetailsOriginalExcelSheet1DAO>()).sheet(0).headRowNumber(1).doReadSync();
             inputStream1.close();
@@ -69,8 +71,8 @@ public class WagesServiceImpl implements WagesService {
             if (wagesOveList.size() > 0) {
                 wagesMapper.deleteWagesOverviewOriginal(wagesOveList.get(0).getMonth(), wagesOveList.get(0).getYear());
             }
-            wagesMapper.insertDetailsOriginal(wagesDetList);
-            wagesMapper.insertWagesOverviewOriginal(wagesOveList);
+            wagesMapper.insertDetailsOriginal(wagesDetList, date);
+            wagesMapper.insertWagesOverviewOriginal(wagesOveList, date);
             return "导入成功！";
         } catch (IOException e) {
             e.printStackTrace();

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

@@ -10,7 +10,7 @@
         heatstroke_prevention_subsidy, heating_subsidy, manuscript_fee, driver_allowance,graduate_settlement_fee,
         one_time_disability_subsidy,lecture_and_exam_fee,other_subsidies,house_rent,Wages_payable,accommodation,
         heating_fee,trade_union_dues,compensation_deduction,other_deductions,mutual_medical_aid,communication_fee,tax1,tax2,pension_insurance,
-        unemployment_insurance,medical_insurance,annuity,housing_provident_fund,enterprise_fund,annuity_income_tax,total_payment,total_salary_disbursement)
+        unemployment_insurance,medical_insurance,annuity,housing_provident_fund,enterprise_fund,annuity_income_tax,total_payment,total_salary_disbursement,import_time)
         values
         <foreach collection="accList" item="list" separator=",">
             (#{list.year}, #{list.month}, #{list.unitName}, #{list.peopleCount},
@@ -25,18 +25,18 @@
             , #{list.mutualMedicalAid}, #{list.communicationFee}, #{list.tax1}, #{list.tax2}, #{list.pensionInsurance}
             , #{list.unemploymentInsurance}, #{list.medicalInsurance}, #{list.annuity}, #{list.housingProvidentFund},
             #{list.enterpriseFund}
-            , #{list.annuityIncomeTax}, #{list.totalPayment}, #{list.totalSalaryDisbursement})
+            , #{list.annuityIncomeTax}, #{list.totalPayment}, #{list.totalSalaryDisbursement}, #{date})
         </foreach>
     </insert>
     <insert id="insertWagesOverviewOriginal">
         insert into wages_overview_original_data(year,month,unit_code,unit_name,worker_count,worker_wages_payable,
-        cadre_count,cadre_wages_payable,total_count,total_wages_payable)
+        cadre_count,cadre_wages_payable,total_count,total_wages_payable,import_time)
         values
         <foreach collection="accList" item="list" separator=",">
             (#{list.year}, #{list.month}, #{list.unitCode}, #{list.unitName},
             #{list.workerCount},
             #{list.workerWagesPayable}, #{list.cadreCount}, #{list.cadreWagesPayable}, #{list.totalCount},
-            #{list.totalWagesPayable})
+            #{list.totalWagesPayable}, #{date})
         </foreach>
     </insert>
     <delete id="deleteDetailsOriginal">
@@ -51,6 +51,16 @@
         where month = #{month}
           and year = #{year}
     </delete>
+    <delete id="deleteOverviewToDate">
+        delete
+        from wages_overview_original_data
+        where import_time = #{date};
+    </delete>
+    <delete id="deleteDetailsToDate">
+        delete
+        from wages_details_original_data
+        where import_time = #{date};
+    </delete>
     <select id="queryList" resultType="com.ruoyi.system.model.wages.vo.WagesOverviewOriginalDataVO">
         select year                 as year,
                month                as month,