diff --git a/buildpackage/src/main/resources/application-hclocal.yml b/buildpackage/src/main/resources/application-hclocal.yml index c929cbc3..8bd88fd6 100644 --- a/buildpackage/src/main/resources/application-hclocal.yml +++ b/buildpackage/src/main/resources/application-hclocal.yml @@ -19,15 +19,15 @@ spring: # username: root # password: bd993088e8a7c3dc5f44441617f9b4bf # driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 -# url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true -# username: root -# password: 62e4295b615a30dbf3b8ee96f41c820b -# driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 + url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true + username: root + password: 62e4295b615a30dbf3b8ee96f41c820b + driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 - url: jdbc:sqlserver://192.168.15.15:1433;DatabaseName=businesscenter;encrypt=false;trustServerCertificate=true - username: sa - password: dec7d858be572746a8432026c0e9312c - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver +# url: jdbc:sqlserver://192.168.15.15:1433;DatabaseName=businesscenter;encrypt=false;trustServerCertificate=true +# username: sa +# password: dec7d858be572746a8432026c0e9312c +# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver savefile: # 文件保存路径 path: D:\yongansystem\kangarooDataCenter\v3\logs diff --git a/buildpackage/src/main/resources/cfgHome/plugin/grpU8/spring/spring-buildpackage-plugin.xml b/buildpackage/src/main/resources/cfgHome/plugin/grpU8/spring/spring-buildpackage-plugin.xml index 26e7591f..2931fc8d 100644 --- a/buildpackage/src/main/resources/cfgHome/plugin/grpU8/spring/spring-buildpackage-plugin.xml +++ b/buildpackage/src/main/resources/cfgHome/plugin/grpU8/spring/spring-buildpackage-plugin.xml @@ -2,4 +2,5 @@ + diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java index 4f5cd1eb..723b678e 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java @@ -70,7 +70,7 @@ public class SenderGlPzmlDaoImpl extends MybatisGenericDao) super.selectList("queryGlPzmlSxy",senderGlPzmlEntity); } - @DS("#entity.dataSourceCode") + @DS("#senderGlPzmlEntity.dataSourceCode") @Override public List queryGlPzmlSxyCancelled(SenderGlPzmlEntity senderGlPzmlEntity) { return (List) super.selectList("queryGlPzmlSxyCancelled",senderGlPzmlEntity); diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml index 9ea16a04..ffad8de1 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml @@ -294,7 +294,7 @@ left join pzmlCzrzb czrz on czrz.idpzh=pzml.idpzh and pzml.idpzh = #{idpzh} - and (pzml.srrq>=#{srrq} or pzml.shrq >=#{shrq} or pzml.jzrq>=#{jzrq}) and pznr.zbid!=0 and pzml.zt!='0' + and (pzml.srrq>=#{srrq} or pzml.shrq >=#{shrq} or pzml.jzrq>=#{jzrq}) and pznr.zbid!=0 and czrz.update_time > #{ts} and pzml.zt in ('1','2','3') group by pznr.idpznr, @@ -306,7 +306,7 @@ - select pznr.idpznr as idpzh, pznr.kjqj as kjqj, @@ -317,10 +317,10 @@ pznr.gsdm,pznr.zth,pznr.kjqj,pznr.pzh from GL_Pzml pzml left join gl_pznr pznr on pznr.idpzh=pzml.idpzh and pzml.kjqj=pznr.kjqj - left join pzmlCzrzb czrz on czrz.idpzh=pzml.idpzh + left join pzmlCzrzbzf czrz on czrz.idpzh=pzml.idpzh and pzml.idpzh = #{idpzh} - and (pzml.srrq>=#{srrq} or pzml.shrq >=#{shrq} or pzml.jzrq>=#{jzrq}) and pznr.zbid!=0 and pzml.zt!='0' + and (pzml.srrq>=#{srrq} or pzml.shrq >=#{shrq} or pzml.jzrq>=#{jzrq}) and pznr.zbid!=0 and czrz.update_time > #{ts} and pzml.zt='0' group by pznr.idpznr, diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java index 02b5bcb8..b2da5479 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java @@ -760,8 +760,53 @@ public class SenderGlPzmlServiceImpl extends BaseService list = senderGlPzmlDao.queryGlPzmlSxyCancelled(glPzmlEntity); + if(CollectionUtils.isEmpty(list)){ + return BaseResult.getSuccessMessageEntity("没有需要同步得作废凭证",null); + } + //更新TS时间 + ts = com.hzya.frame.dateutil.DateUtil.dateToString(new Date(), "yyyy-MM-dd HH:mm:ss"); + logger.info("凭证TS已更新：" + ts); + try { + String result=null; + for (SenderGlPzmlEntity pzmlEntity : list) { + JSONObject jsonObjectCode=new JSONObject(); + jsonObjectCode.put("code",pzmlEntity.getIdpzh()); + String params = jsonObjectCode.toJSONString(); + logger.info("调用商学院凭证作废接口请求参数：{}",params); + result = HttpRequest.post(URL + "nky/service/zsApi/dealInvalid?accessToken="+token).header("Content-Type", "application/json;charset=UTF-8").timeout(30000).body(params).execute().body(); + logger.info("调用商学院凭证作废接口返回参数：{}",result); + } + JSONObject jsonObjectResult=new JSONObject(); + jsonObjectResult.put("status","200"); + jsonObjectResult.put("pzml",result); + return jsonObjectResult; + }catch (Exception e){ + logger.info("根据凭证idpzh:{}查询作废凭证:{}",glPzmlEntity.getIdpzh(),e.getMessage()); + return BaseResult.getFailureMessageEntity("根据凭证查询作废凭证失败"); + } }