shilei
/
weaver-sxjg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#weaver-sxjg-03# 更新git最新的代码

Browse Source
main
shilei 1 year ago
parent db2fb45623
commit de63450c1c
6 changed files with 51 additions and 39 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/weaver/seconddev/sxjg/controller/CheckPositionController.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.weaver.seconddev.sxjg.controller;
import com.weaver.common.authority.annotation.WeaPermission;
import com.weaver.common.base.entity.result.WeaResult;
import com.weaver.seconddev.sxjg.service.JoinPositionRule;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@ -14,6 +15,7 @@ import java.util.Map;
@RestController
@RequestMapping("/papi/secondev/sxjg")
@Slf4j
public class CheckPositionController {
@Autowired

8
src/main/java/com/weaver/seconddev/sxjg/controller/PayslipPageController.java
Unescape Escape View File

@ -15,8 +15,7 @@ import com.weaver.common.base.entity.result.WeaResult;
import com.weaver.seconddev.sxjg.config.EbDbDataSourceConfigResp;
import com.weaver.seconddev.sxjg.util.NccApiUtil;
import com.weaver.seconddev.sxjg.util.ProvinceCityNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.web.bind.annotation.*;
@ -27,10 +26,9 @@ import java.util.*;
@RestController
@RequestMapping("/papi/secondev/sxjg")
@Slf4j
public class PayslipPageController {
private final Logger log = LoggerFactory.getLogger(PayslipPageController.class);
private JdbcTemplate jdbcTemplateresp = new JdbcTemplate(EbDbDataSourceConfigResp.dbDataSource());
//根据人员id获取人员outkey字段
@ -204,7 +202,7 @@ public class PayslipPageController {
return WeaResult.success(result);
}else {
JSONArray result = new JSONArray();
String sql = "select pk_defdoc,defdocname,enablestate,pid from ec_ebuilder_designer.uf_ncc_defdoc where doclistpk = '"+dataSourcePk+"'";
String sql = "select pk_defdoc,defdocname,enablestate,pid from ec_ebuilder_designer.uf_ncc_defdoc where doclistpk = '"+dataSourcePk+"' order by defdoccode ASC";
List<Map<String, Object>> rs = jdbcTemplateresp.queryForList(sql);
Map<String, Object> singlemap = null;
if(CollectionUtil.isNotEmpty(rs)) {

20
src/main/java/com/weaver/seconddev/sxjg/controller/PayslipPageTestController.java
Unescape Escape View File

@ -84,8 +84,8 @@
// public void test1() throws Exception {
// Map<String,String> rs = new HashMap<>();
// JSONObject r3 = new JSONObject();
// r3.put("pk_psndoc","0001A2100000006CWEBW");
// r3.put("tableCode","hi_psndoc_linkman");
// r3.put("pk_psndoc","0001A2100000007KUXWS");
// r3.put("tableCode","bd_psndoc");
// NccApiUtil nccApiUtil = new NccApiUtil();
// nccApiUtil.init();
// String token = nccApiUtil.getToken();
@ -122,9 +122,19 @@
// JSONObject dataObj21 = dataObj2.getJSONObject("data");
// //如果是基本信息查询
// if("bd_psndoc".equals(r3.getString("tableCode"))) {
// JSONArray afterdata = null;
// if(dataObj21 != null && dataObj21.containsKey("afterData") && dataObj21.get("afterData") != null) {
// afterdata = dataObj21.getJSONArray("afterData");
// JSONArray afterdata = new JSONArray();
// JSONArray changedataArray = dataObj21.getJSONArray("changedata");
// if(changedataArray!=null && changedataArray.size()>0) {
// for(int i = 0;i<changedataArray.size();i++) {
// JSONObject changeobj = changedataArray.getJSONObject(i);
// JSONArray afterdata1 = changeobj.getJSONArray("afterData");
// if(afterdata1!=null &&afterdata1.size()>0) {
// for(int i1 = 0;i1 < afterdata1.size();i1++) {
// JSONObject jsonObjecti1 = afterdata1.getJSONObject(i1);
// afterdata.add(jsonObjecti1);
// }
// }
// }
// }
// if(afterdata != null && afterdata.size() > 0) {
// dataArrayOne = resJsonObject.getJSONArray("data");

36
src/main/java/com/weaver/seconddev/sxjg/esb/PayslipPageQuery.java
Unescape Escape View File

@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONObject;
import com.weaver.common.base.entity.result.WeaResult;
import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface;
import com.weaver.seconddev.sxjg.util.NccApiUtil;
//import com.weaver.seconddev.sxjg.util.NccResultUtil;
//import org.junit.Test;
import com.weaver.seconddev.sxjg.util.NccResultUtil;
import org.junit.Test;
import org.springframework.stereotype.Service;
import java.util.Map;
@ -21,20 +21,20 @@ public class PayslipPageQuery implements EsbServerlessRpcRemoteInterface {
return null;
}
// @Test
// public void Test() throws Exception {
// JSONObject r1 = new JSONObject();
// JSONArray r2 = new JSONArray();
// JSONObject r3 = new JSONObject();
// r3.put("pk_psndoc","0001A2100000003FMWBU");
// r2.add(r3);
// r1.put("data",r2);
//
// NccApiUtil nccApiUtil = new NccApiUtil();
// nccApiUtil.init();
// String token = nccApiUtil.getToken();
// String url = nccApiUtil.getBaseUrl()+"nccloud/api/hrtrn/openAPI/payslipSync/entry";
// String rs11 = nccApiUtil.doJsonPost(url,token,r1.toJSONString());
// System.out.println(rs11);
// }
@Test
public void Test() throws Exception {
JSONObject r1 = new JSONObject();
JSONArray r2 = new JSONArray();
JSONObject r3 = new JSONObject();
r3.put("pk_psndoc","0001A2100000003FMWBU");
r2.add(r3);
r1.put("data",r2);
NccApiUtil nccApiUtil = new NccApiUtil();
nccApiUtil.init();
String token = nccApiUtil.getToken();
String url = nccApiUtil.getBaseUrl()+"nccloud/api/hrtrn/openAPI/payslipSync/entry";
String rs11 = nccApiUtil.doJsonPost(url,token,r1.toJSONString());
System.out.println(rs11);
}
}

22
src/main/java/com/weaver/seconddev/sxjg/esb/TestDd.java
Unescape Escape View File

@ -3,19 +3,19 @@ package com.weaver.seconddev.sxjg.esb;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.weaver.seconddev.sxjg.util.NccApiUtil;
//import org.junit.Test;
import org.junit.Test;
public class TestDd {
// @Test
// public void test() throws Exception {
// String str = "{\"data\":[{\"waflag\":\"Y\",\"begindate\":\"2024-03-18\",\"wa_prmlv\":\"\",\"pk_wa_item_showname\":\"基本工资标准\",\"pk_wa_grd_showname\":\"\",\"negotiation_wage\":\"Y\",\"vnote\":\"1\",\"nmoney\":\"1.00\",\"psnName\":\"许轲\",\"psnCode\":\"00058978\"},{\"waflag\":\"Y\",\"begindate\":\"2024-03-18\",\"wa_prmlv\":\"13&4档\",\"pk_wa_item_showname\":\"效益工资标准\",\"pk_wa_grd_showname\":\"陕建六建集团效益工资标准\",\"negotiation_wage\":\"N\",\"vnote\":\"2\",\"nmoney\":\"1304.00\",\"psnName\":\"许轲\",\"psnCode\":\"00058978\"}],\"state\":\"2\",\"pk_org\":\"0001A21000000000IR6D\"}";
// NccApiUtil nccApiUtil = new NccApiUtil();
// nccApiUtil.init();
// String token = nccApiUtil.getToken();
// String url = nccApiUtil.getBaseUrl()+"nccloud/api/hrwa/customermanage/adjust/import";
// String rs11 = nccApiUtil.doJsonPost(url,token,str);
// System.out.println(rs11);
// }
@Test
public void test() throws Exception {
String str = "{\"data\":[{\"waflag\":\"Y\",\"begindate\":\"2024-03-18\",\"wa_prmlv\":\"\",\"pk_wa_item_showname\":\"基本工资标准\",\"pk_wa_grd_showname\":\"\",\"negotiation_wage\":\"Y\",\"vnote\":\"1\",\"nmoney\":\"1.00\",\"psnName\":\"许轲\",\"psnCode\":\"00058978\"},{\"waflag\":\"Y\",\"begindate\":\"2024-03-18\",\"wa_prmlv\":\"13&4档\",\"pk_wa_item_showname\":\"效益工资标准\",\"pk_wa_grd_showname\":\"陕建六建集团效益工资标准\",\"negotiation_wage\":\"N\",\"vnote\":\"2\",\"nmoney\":\"1304.00\",\"psnName\":\"许轲\",\"psnCode\":\"00058978\"}],\"state\":\"2\",\"pk_org\":\"0001A21000000000IR6D\"}";
NccApiUtil nccApiUtil = new NccApiUtil();
nccApiUtil.init();
String token = nccApiUtil.getToken();
String url = nccApiUtil.getBaseUrl()+"nccloud/api/hrwa/customermanage/adjust/import";
String rs11 = nccApiUtil.doJsonPost(url,token,str);
System.out.println(rs11);
}
// @Test
// public void test1() throws Exception {
// JSONObject r1 = new JSONObject();

2
src/main/java/com/weaver/seconddev/sxjg/service/Impl/JoinPositionRuleImpl.java
Unescape Escape View File

@ -3,12 +3,14 @@ package com.weaver.seconddev.sxjg.service.Impl;
import cn.hutool.core.collection.CollectionUtil;
import com.weaver.seconddev.sxjg.config.EbDbDataSourceConfig;
import com.weaver.seconddev.sxjg.service.JoinPositionRule;
import lombok.extern.slf4j.Slf4j;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Slf4j
@Service
public class JoinPositionRuleImpl implements JoinPositionRule {

Write Preview
Loading…
Cancel
Save