hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dongj' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dongj

This commit is contained in:
lvleigang 2025-02-10 10:22:28 +08:00
parent 476bde0f64 b447546951
commit f894e0c754
2 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
buildpackage/src/main/java/com/hzya/frame/plugin/u8c/service/impl/SalesBillingServiceImpl.java
View File

@ -29,9 +29,10 @@ public class SalesBillingServiceImpl implements ISalesBillingService {
private IU8cSalesBillingService iu8cSalesBillingService;
private final String appId = "800035";
private final String apiCode = "8000350047";
//这个接口调错了。要用开发的那个审批接口
//private final String apiCode = "8000350047";
private final String apiCode = "8000350060";
// private final String apiCode = "8000350060";
private final String publicKey = "ZJYATW/MfYZX7zF0eAh4DJXbyTLwUtwSoSz5Y/o1ksAaN/dCe7eDIk+3zDUT+v578prj";
private final String secretKey = "+5BUkLQh3iX3VHgEt5bE2IPh+ZeebGvDaEspsvVu739Ar6sFnwg+fpPod4t6XhoTj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=";
@ -124,8 +125,10 @@ public class SalesBillingServiceImpl implements ISalesBillingService {
queryinfo.put("code", code);
queryinfo.put("corp", entity.getCorp());//公司编码
queryinfo.put("date_begin", entity.getDateBegin());//单据开始日期
queryinfo.put("date_end", entity.getDateEnd());//单据结束日期
approveinfo.put("approvid", entity.getApprovid());//审批人
// queryinfo.put("date_end", entity.getDateEnd());//单据结束日期
queryinfo.put("date_end", "2099-05-24");//单据结束日期
// approveinfo.put("approvid", entity.getApprovid());//审批人
approveinfo.put("approvid", "15715849962");//审批人
approveinfo.put("approveDate", entity.getApprovedate());//审核时间
approveinfo.put("status", entity.getStatus());//审批状态（Y：通过，N：不通过，R：驳回）
approveinfo.put("note", entity.getNote());//批语
@ -135,14 +138,14 @@ public class SalesBillingServiceImpl implements ISalesBillingService {
params = data.toJSONString();
//用新的审批接口
JSONObject jsonObject = new JSONObject();
jsonObject.put("billno",entity.getCode());
jsonObject.put("corpcode",entity.getCorp());
jsonObject.put("billType","saleinvoice");
jsonObject.put("userCode","15715849962");
jsonObject.put("ckeckResult","Y");
jsonObject.put("ckeckNote","审批通过");
params = jsonObject.toString();
// JSONObject jsonObject = new JSONObject();
// jsonObject.put("billno",entity.getCode());
// jsonObject.put("corpcode",entity.getCorp());
// jsonObject.put("billType","saleinvoice");
// jsonObject.put("userCode","15715849962");
// jsonObject.put("ckeckResult","Y");
// jsonObject.put("ckeckNote","审批通过");
// params = jsonObject.toString();
return params;
}

2
service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.xml
View File

@ -85,7 +85,7 @@
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
<if test="workshopName != null and workshopName != ''"> and workshop_name like concat('%',#{workshopName},'%') </if>
<if test="plugId != null and plugId != ''"> and plug_id like concat('%',#{plugId},'%') </if>
<if test="plugId != null and plugId != ''"> and plug_id = #{plugId}, </if>
<if test="plugName != null and plugName != ''"> and plug_name like concat('%',#{plugName},'%') </if>
<if test="remark != null and remark != ''"> and remark like concat('%',#{remark},'%') </if>
<if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>