Commit 406b08a2 authored by chengwenlong's avatar chengwenlong

凭证用友接口取数

parent 0f1af031
...@@ -84,6 +84,30 @@ ...@@ -84,6 +84,30 @@
<version>1.5.10</version> <version>1.5.10</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-supplies</artifactId>
<version>3.4.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-supplies</artifactId>
<version>3.4.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-supplies</artifactId>
<version>3.4.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-supplies</artifactId>
<version>3.4.0</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
...@@ -3,10 +3,14 @@ package com.ruoyi.system.mapper; ...@@ -3,10 +3,14 @@ package com.ruoyi.system.mapper;
import com.ruoyi.system.model.wages.dao.WagesSalaryProof; import com.ruoyi.system.model.wages.dao.WagesSalaryProof;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.List;
/** /**
* 2024/5/22 * 2024/5/22
*/ */
@Repository @Repository
public interface WagesSalaryProofMapper { public interface WagesSalaryProofMapper {
WagesSalaryProof selectWagesVoucherList(WagesSalaryProof wagesSalaryProof); WagesSalaryProof selectWagesVoucherList(WagesSalaryProof wagesSalaryProof);
List<WagesSalaryProof> selectWagesVoucherLikeList(WagesSalaryProof wagesSalaryProofLike);
} }
...@@ -4,12 +4,15 @@ import com.alibaba.excel.EasyExcelFactory; ...@@ -4,12 +4,15 @@ import com.alibaba.excel.EasyExcelFactory;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.ruoyi.system.common.ReturnResult;
import com.ruoyi.system.listener.ExcelListener; import com.ruoyi.system.listener.ExcelListener;
import com.ruoyi.system.mapper.WagesMapper; import com.ruoyi.system.mapper.WagesMapper;
import com.ruoyi.system.mapper.WagesSalaryProofMapper; import com.ruoyi.system.mapper.WagesSalaryProofMapper;
import com.ruoyi.system.model.doc.CustomDocRequestModel;
import com.ruoyi.system.model.wages.dao.*; import com.ruoyi.system.model.wages.dao.*;
import com.ruoyi.system.model.wages.vo.WagesOverviewOriginalDataVO; import com.ruoyi.system.model.wages.vo.WagesOverviewOriginalDataVO;
import com.ruoyi.system.service.WagesService; import com.ruoyi.system.service.WagesService;
import com.ruoyi.system.yyinterface.VoucherUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -22,7 +25,6 @@ import java.io.InputStream; ...@@ -22,7 +25,6 @@ import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* 2024/4/27 * 2024/4/27
*/ */
...@@ -125,16 +127,37 @@ public class WagesServiceImpl implements WagesService { ...@@ -125,16 +127,37 @@ public class WagesServiceImpl implements WagesService {
jsonObject1.put("auxiliary_item_b",wagesSalaryProof1.getAuxiliaryItemB()); jsonObject1.put("auxiliary_item_b",wagesSalaryProof1.getAuxiliaryItemB());
}else{ }else{
//如果项目带前带(,去获取相似项目的值 //如果项目带前带(,去获取相似项目的值
// if(sourceOfExpenses.startsWith("(")){ if(sourceOfExpenses.startsWith("(")||sourceOfExpenses.startsWith("(")){
// for (int i = 0; i < borrowlists.size(); i++) { WagesSalaryProof wagesSalaryProofLike = new WagesSalaryProof();
// JSONObject obj = borrowlists.getJSONObject(i); wagesSalaryProofLike.setAbStract(abStract);
// if (obj.getString("classary").equals(abStract) && obj.getInt("age") == searchAge) { wagesSalaryProofLike.setSourceOfExpenses("(%");
// found = obj; wagesSalaryProofLike.setIsDebit(isDebit);
// break; List<WagesSalaryProof> wagesSalaryProofsList = wagesSalaryProofMapper.selectWagesVoucherLikeList(wagesSalaryProofLike);
// } if(wagesSalaryProofsList.size()>0){
// } WagesSalaryProof WagesSalaryProof3=wagesSalaryProofsList.get(0);
// jsonObject1.put("account_code",WagesSalaryProof3.getAccountCode());
// } jsonObject1.put("auxiliary_item_a",WagesSalaryProof3.getAuxiliaryItemA());
int index = sourceOfExpenses.indexOf(")");
if(index==-1){
index = sourceOfExpenses.indexOf(")");
}
if(index>=0){
String lbname=sourceOfExpenses.substring(index+1);
String lbname2="项目";
//用友取数
CustomDocRequestModel docRequest = new CustomDocRequestModel();
docRequest.setPageIndex(Long.valueOf(1L));
docRequest.setPageSize(Long.valueOf(500L));
docRequest.setName(lbname);
String codeFromCustomDoc = "";
JSONArray customDoc = getCustomDoc(docRequest);
codeFromCustomDoc = getCodeFromCustomDoc(customDoc, lbname2);
jsonObject1.put("auxiliary_item_b",lbname2+":"+codeFromCustomDoc+"/"+lbname);
}
}
}
} }
borrowlists.add(jsonObject1); borrowlists.add(jsonObject1);
...@@ -170,4 +193,23 @@ public class WagesServiceImpl implements WagesService { ...@@ -170,4 +193,23 @@ public class WagesServiceImpl implements WagesService {
object.put("loan",loanlists); object.put("loan",loanlists);
return object; return object;
} }
public JSONArray getCustomDoc(CustomDocRequestModel customDocRequestModel) {
ReturnResult customDocument = VoucherUtils.callVoucherQuery(customDocRequestModel, "/yonbip/digitalModel/customerdoc/list");
JSONObject customDocumentJsonObj = (JSONObject)JSON.toJSON(customDocument.getData().get(0));
return customDocumentJsonObj.getJSONArray("recordList");
}
private String getCodeFromCustomDoc(JSONArray customDoc, String nameZhCn) {
String code = null;
for (Object o : customDoc) {
JSONObject object = (JSONObject)o;
String custdocdefid_name = object.getString("custdocdefid_name");
if (custdocdefid_name.equals(nameZhCn)) {
code = object.getString("code");
break;
}
}
return code;
}
} }
...@@ -39,5 +39,27 @@ ...@@ -39,5 +39,27 @@
</if> </if>
</select> </select>
<select id="selectWagesVoucherLikeList" 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 LIKE #{sourceOfExpenses}
</if>
<if test="isDebit != null and isDebit != ''">
AND is_debit = #{isDebit}
</if>
</select>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment