Merge branch 'grpU8' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
This commit is contained in:
commit
9abeb7015d
|
|
@ -10,18 +10,28 @@ logging:
|
|||
spring:
|
||||
datasource:
|
||||
dynamic:
|
||||
druid:
|
||||
filters: stat,log4j2
|
||||
validationQuery: SELECT 1 # 验证数据库服务可用性的sql.用来检测连接是否有效的sql 因数据库方言而差, 例如 oracle 应该写成 SELECT 1 FROM DUAL
|
||||
datasource:
|
||||
master:
|
||||
# url: jdbc:mysql://ufidahz.com.cn:9096/businesscenternew?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: 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
|
||||
savefile:
|
||||
# 文件保存路径
|
||||
path: D:\yongansystem\kangarooDataCenter\v3\logs
|
||||
tomcatpath: /Users/apple/Desktop/log/local
|
||||
pluginpath: /Users/apple/Desktop/log/local
|
||||
zt:
|
||||
url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<plugin>
|
||||
<id>GlPzmlPlugin</id>
|
||||
<name>GlPzmlPlugin插件</name>
|
||||
<category>90000001</category>
|
||||
</plugin>
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
|
||||
<beans default-autowire="byName">
|
||||
<bean name="glPzmlDao" class="com.hzya.frame.plugin.grpU8.glpzml.dao.impl.GlPzmlDaoImpl" />
|
||||
</beans>
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
|
||||
<beans default-autowire="byName">
|
||||
<bean name="glPzmlInitializer" class="com.hzya.frame.plugin.grpU8.glpzml.plugin.GlPzmlPluginInitializer" />
|
||||
</beans>
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
|
||||
<beans default-autowire="byName">
|
||||
<bean name="glPzmlService" class="com.hzya.frame.plugin.grpU8.glpzml.service.impl.GlPzmlServiceImpl" />
|
||||
</beans>
|
||||
|
|
@ -90,6 +90,27 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
|
|||
if(!checkStr(jsonObject.getString("ysfamc"))){
|
||||
return BaseResult.getFailureMessageEntity("请传递预算方案名称");
|
||||
}
|
||||
if(!checkStr(jsonObject.getString("shrid"))){
|
||||
return BaseResult.getFailureMessageEntity("请传递审核人id");
|
||||
}
|
||||
if(!checkStr(jsonObject.getString("pfrid"))){
|
||||
return BaseResult.getFailureMessageEntity("请传递批复人id");
|
||||
}
|
||||
if(!checkStr(jsonObject.getString("xmdm"))){
|
||||
return BaseResult.getFailureMessageEntity("请传递项目代码");
|
||||
}
|
||||
if(!checkStr(jsonObject.getString("xmmc"))){
|
||||
return BaseResult.getFailureMessageEntity("请传递项目名称");
|
||||
}
|
||||
if(!checkStr(jsonObject.getString("bmdm"))){
|
||||
return BaseResult.getFailureMessageEntity("请传递部门代码");
|
||||
}
|
||||
if(!checkStr(jsonObject.getString("bmmc"))){
|
||||
return BaseResult.getFailureMessageEntity("请传递部门名称");
|
||||
}
|
||||
if(!("01").equals(jsonObject.getString("ysfadm")) && !("02").equals(jsonObject.getString("ysfadm"))){
|
||||
return BaseResult.getFailureMessageEntity("请传递预算方案代码并且值为01或者02");
|
||||
}
|
||||
GbiZbxmbEntity gbiZbxmbEntity = jsonObject.toJavaObject(GbiZbxmbEntity.class);
|
||||
/*try {
|
||||
//查询指标id最大值和指标代码最大值
|
||||
|
|
|
|||
|
|
@ -261,7 +261,7 @@
|
|||
|
||||
<!-- 查询列表 商学院所需要的凭证数据-->
|
||||
<select id="queryGlPzmlSxy" resultMap="get-SenderGlPzmlEntity-result" parameterType = "com.hzya.frame.grpU8.nxproof.glPzml.entity.SenderGlPzmlEntity">
|
||||
select
|
||||
<!-- select
|
||||
pzml.idpzh as idpzh,
|
||||
pzml.kjqj as kjqj,
|
||||
pzml.srrq as srrq,
|
||||
|
|
@ -278,8 +278,28 @@
|
|||
pzml.kjqj,
|
||||
pzml.srrq,
|
||||
pzml.pzzy,
|
||||
pzml.gsdm,pzml.zth,pzml.kjqj,pzml.pzh
|
||||
pzml.gsdm,pzml.zth,pzml.kjqj,pzml.pzh-->
|
||||
|
||||
select
|
||||
pznr.idpznr as idpzh,
|
||||
pznr.kjqj as kjqj,
|
||||
pzml.srrq as srrq,
|
||||
pznr.bmdm,
|
||||
pznr.zy as pzzy,
|
||||
sum(pznr.je) as pzje,
|
||||
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
|
||||
<trim prefix="where" prefixOverrides="and">
|
||||
<if test="idpzh !=null and idpzh!='' "> and pzml.idpzh = #{idpzh} </if>
|
||||
and (pzml.srrq>=#{srrq} or pzml.shrq >=#{shrq} or pzml.jzrq>=#{jzrq}) and pznr.zbid!=0
|
||||
</trim>
|
||||
group by pznr.idpznr,
|
||||
pznr.kjqj,
|
||||
pzml.srrq,
|
||||
pznr.zy,
|
||||
pznr.bmdm,
|
||||
pznr.gsdm,pznr.zth,pznr.kjqj,pznr.pzh
|
||||
</select>
|
||||
|
||||
<!--新增所有列-->
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@ import java.util.UUID;
|
|||
@Service(value = "SenderGlPzmlServiceImpl")
|
||||
public class SenderGlPzmlServiceImpl extends BaseService<SenderGlPzmlEntity, String> implements ISenderGlPzmlService {
|
||||
|
||||
private static String URLTest="http://39.106.158.149/";//测试环境
|
||||
private static String URL="http://192.168.42.22/";//正式环境
|
||||
private static String URLTest="http://60.205.205.82/";//测试环境 http://39.106.158.149/
|
||||
private static String URL="http://192.168.250.71/";//正式环境 http://192.168.42.22/
|
||||
|
||||
private ISenderGlPzmlDao senderGlPzmlDao;
|
||||
|
||||
|
|
@ -706,12 +706,13 @@ public class SenderGlPzmlServiceImpl extends BaseService<SenderGlPzmlEntity, Str
|
|||
jsonObjectParams.put("code",pzmlEntity.getIdpzh());//pzid
|
||||
jsonObjectParams.put("budgetYear",pzmlEntity.getKjqj().substring(0,4));//预算年度
|
||||
jsonObjectParams.put("applyDate",outputDateString);//日期
|
||||
jsonObjectParams.put("depCode",pzmlEntity.getBmdm());//部门代码
|
||||
jsonObjectParams.put("description",pzmlEntity.getPzzy());//说明
|
||||
jsonObjectParams.put("amount",roundedValue.doubleValue());//金额
|
||||
jsonObjectParams.put("pzNum",pzNum);//凭证号 例如：公司代码+账套号+会计期间+凭证号：001_001_202408_付款_1
|
||||
//根据idpzh查询指标id和指标金额以及部门经济科目
|
||||
SenderGlPznrEntity senderGlPznrEntity=new SenderGlPznrEntity();
|
||||
senderGlPznrEntity.setIdpzh(pzmlEntity.getIdpzh());
|
||||
senderGlPznrEntity.setIdpznr(pzmlEntity.getIdpzh());
|
||||
senderGlPznrEntity.setDataSourceCode(glPzmlEntity.getDataSourceCode());
|
||||
List<SenderGlPznrEntity> senderGlPznrEntities = senderGlPznrDao.queryGlPznrSxy(senderGlPznrEntity);
|
||||
logger.info("=======根据凭证idpzh:{}查询的指标金额和指标id以及部门经济科目数据有{}条",pzmlEntity.getIdpzh(),senderGlPznrEntities.size());
|
||||
|
|
@ -736,7 +737,7 @@ public class SenderGlPzmlServiceImpl extends BaseService<SenderGlPzmlEntity, Str
|
|||
jsonObjectData.put("data",jsonArray);
|
||||
String params = jsonObjectData.toJSONString();
|
||||
logger.info("调用商学院凭证保存接口请求参数：{}",params);
|
||||
result = HttpRequest.post(URLTest + "/nky/service/zsApi/saveZJSYPZReimburse?accessToken="+token).header("Content-Type", "application/json;charset=UTF-8").timeout(30000).body(params).execute().body();
|
||||
result = HttpRequest.post(URLTest + "nky/service/zsApi/saveZJSYPZReimburse?accessToken="+token).header("Content-Type", "application/json;charset=UTF-8").timeout(30000).body(params).execute().body();
|
||||
logger.info("调用商学院凭证保存接口返回参数：{}",result);
|
||||
}
|
||||
JSONObject jsonObjectResult=new JSONObject();
|
||||
|
|
|
|||
|
|
@ -473,7 +473,7 @@
|
|||
</select>
|
||||
|
||||
<select id="queryGlPznrSxy" resultMap="get-SenderGlPznrEntity-result" parameterType = "com.hzya.frame.grpU8.nxproof.glPznr.entity.SenderGlPznrEntity">
|
||||
select je,fzdm5,zbid from gl_pznr where zbid !=0 and idpzh=#{idpzh}
|
||||
select je,fzdm5,zbid from gl_pznr where zbid !=0 and idpznr=#{idpznr}
|
||||
</select>
|
||||
|
||||
<!--新增所有列-->
|
||||
|
|
|
|||
Loading…
Reference in New Issue