From 90358014449dc8ca77b4739a4b60c7381c43e669 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Wed, 24 Jul 2024 11:06:16 +0800
Subject: [PATCH 01/26] =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mdmModuleDb/entity/MdmModuleDbEntity.xml | 2 +
.../mdm/service/impl/MdmServiceImpl.java | 77 ++++++++++---------
2 files changed, 42 insertions(+), 37 deletions(-)
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml
index ce49938a..c680877b 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml
@@ -262,6 +262,7 @@ where id = #{id}
and id = #{id}
+ and data_status != 'N'
and sts = 'Y'
@@ -279,6 +280,7 @@ where id = #{id}
and id = #{id}
and sts = 'Y'
+ and data_status != 'N'
order by sorts asc
diff --git a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
index d4f83772..b1ad3001 100644
--- a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
@@ -657,7 +657,7 @@ public class MdmServiceImpl implements IMdmService {
PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
List> businessResult = mdmModuleDao.queryMdmShowData(entity);
//强制把数据库字段转换小写
- if(null != businessResult && businessResult.size() >0){
+ if (null != businessResult && businessResult.size() > 0) {
convertKeysToLowerCase(businessResult);
}
PageInfo pageInfo = new PageInfo(businessResult);
@@ -1060,10 +1060,10 @@ public class MdmServiceImpl implements IMdmService {
//1、主表 2、明细
mainMdmModuleDb = mdmModuleDbEntityList.get(i);
//循环字段表
- if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
- for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
- if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) {
- for (int b = 0; b < mdmModuleViewDetailEntityList.size(); b++) {
+ for (int b = 0; b < mdmModuleViewDetailEntityList.size(); b++) {
+ if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
+ for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
+ if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) {
if (mdmModuleViewDetailEntityList.get(b).getViewFiled().equals(mdmModuleDbFiledsEntityList.get(i1).getId())) {
mainMdmModuleDbFileds.add(mdmModuleDbFiledsEntityList.get(i1));
List mdmModuleDbFiledsRules = new ArrayList<>();
@@ -1078,19 +1078,23 @@ public class MdmServiceImpl implements IMdmService {
}
mdmModuleDbFiledsEntityList.get(i1).setMdmModuleDbFiledsRules(mdmModuleDbFiledsRules);
}
+
}
+
}
}
}
} else if ("2".equals(mdmModuleDbEntityList.get(i).getDbType())) {
//2、明细
sublistMdmModuleDb.add(mdmModuleDbEntityList.get(i));
+
//循环字段表
if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
List sublistMdmModuleDbFileds = new ArrayList<>();
- for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
- if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) {
- for (int b = 0; b < mdmModuleViewDetailEntityList.size(); b++) {
+ for (int b = 0; b < mdmModuleViewDetailEntityList.size(); b++) {
+ for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
+ if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) {
+
if (mdmModuleViewDetailEntityList.get(b).getViewFiled().equals(mdmModuleDbFiledsEntityList.get(i1).getId())) {
sublistMdmModuleDbFileds.add(mdmModuleDbFiledsEntityList.get(i1));
List mdmModuleDbFiledsRules = new ArrayList<>();
@@ -1106,7 +1110,6 @@ public class MdmServiceImpl implements IMdmService {
mdmModuleDbFiledsEntityList.get(i1).setMdmModuleDbFiledsRules(mdmModuleDbFiledsRules);
}
}
-
}
}
mdmModuleDbEntityList.get(i).setSublistMdmModuleDbFileds(sublistMdmModuleDbFileds);
@@ -1824,7 +1827,7 @@ public class MdmServiceImpl implements IMdmService {
mdmModuleDistributeTripartiteEntity.setAppId(sysApplicationEntity.getId());
mdmModuleDistributeTripartiteEntity = mdmModuleDistributeTripartiteDao.queryOneTripartite(mdmModuleDistributeTripartiteEntity);
String tripartiteId = "";
- if(mdmModuleDistributeTripartiteEntity != null && mdmModuleDistributeTripartiteEntity.getTripartiteId() != null ){
+ if (mdmModuleDistributeTripartiteEntity != null && mdmModuleDistributeTripartiteEntity.getTripartiteId() != null) {
tripartiteId = mdmModuleDistributeTripartiteEntity.getTripartiteId();
}
parameterJson.put("tripartiteId", tripartiteId);
@@ -1836,7 +1839,7 @@ public class MdmServiceImpl implements IMdmService {
String querys = null;
/** body */
String bodys = object.toJSONString();
- if (scriptEntity != null && scriptEntity.getId() != null && scriptEntity.getScriptData() != null ) {
+ if (scriptEntity != null && scriptEntity.getId() != null && scriptEntity.getScriptData() != null) {
groovy.put("code", scriptEntity.getScriptCode());
groovy.put("className", scriptEntity.getClassName());
groovy.put("name", scriptEntity.getScriptName());
@@ -1866,7 +1869,7 @@ public class MdmServiceImpl implements IMdmService {
//找到登陆接口
SysApplicationApiEntity loginApi = sysApplicationApiDao.get(apiEntity.getAuthenticationPort());
if (null == loginApi) {
- saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(),mdmModuleDistributeEntity.getId(),"2", "转发失败,认证接口不存在", dbname, object.getString("id"), sysApplicationEntity.getName(), sysApplicationEntity.getId(), apiEntity.getApiName(),apiEntity.getId(), object.toJSONString(), type);
+ saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(), mdmModuleDistributeEntity.getId(), "2", "转发失败,认证接口不存在", dbname, object.getString("id"), sysApplicationEntity.getName(), sysApplicationEntity.getId(), apiEntity.getApiName(), apiEntity.getId(), object.toJSONString(), type);
return BaseResult.getFailureMessageEntity("发送错误,认证接口不存在");
}
@@ -1880,7 +1883,7 @@ public class MdmServiceImpl implements IMdmService {
String rzbodys = getBodys(loginApi, null, null);
JsonResultEntity rzjsonResultEntity = sendData(loginApi, rzheaders, rzbodys, rzquerys);
if (!rzjsonResultEntity.isFlag()) {
- saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(),mdmModuleDistributeEntity.getId(),"2", "转发失败,认证接口调用失败", dbname, object.getString("id"), sysApplicationEntity.getName(),sysApplicationEntity.getId(), apiEntity.getApiName(),apiEntity.getId(), object.toJSONString(), type);
+ saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(), mdmModuleDistributeEntity.getId(), "2", "转发失败,认证接口调用失败", dbname, object.getString("id"), sysApplicationEntity.getName(), sysApplicationEntity.getId(), apiEntity.getApiName(), apiEntity.getId(), object.toJSONString(), type);
return BaseResult.getFailureMessageEntity("发送错误:" + rzjsonResultEntity.getMsg());
}
JSONObject attritube = JSONObject.parseObject(rzjsonResultEntity.getAttribute().toString());
@@ -1906,21 +1909,21 @@ public class MdmServiceImpl implements IMdmService {
if (jsonResultEntity.isFlag()) {
if ("1".equals(type)) {//保存三方返回id
- if (scriptEntity != null && scriptEntity.getId() != null && scriptEntity.getBackScriptData() != null ) {
+ if (scriptEntity != null && scriptEntity.getId() != null && scriptEntity.getBackScriptData() != null) {
JSONObject backScriptJson = new JSONObject();
backScriptJson.put("data", jsonResultEntity.getAttribute());
- groovy.put("code", scriptEntity.getScriptCode()+"back");
- groovy.put("className", scriptEntity.getClassName()+"back");
- groovy.put("name", scriptEntity.getScriptName()+"back");
+ groovy.put("code", scriptEntity.getScriptCode() + "back");
+ groovy.put("className", scriptEntity.getClassName() + "back");
+ groovy.put("name", scriptEntity.getScriptName() + "back");
groovy.put("methodStr", scriptEntity.getBackScriptData());
groovy.put("parameterJson", backScriptJson);
JSONObject groovyStr = new JSONObject();
groovyStr.put("jsonStr", groovy);
try {
Object str = groovyIntegrationService.groovyScriptExecution(groovyStr);
- if(str != null){
+ if (str != null) {
JSONObject backJsonResultEntity = JSONObject.parseObject(str.toString());
- if(backJsonResultEntity != null && backJsonResultEntity.getString("success") != null && "true".equals(backJsonResultEntity.getString("success"))){
+ if (backJsonResultEntity != null && backJsonResultEntity.getString("success") != null && "true".equals(backJsonResultEntity.getString("success"))) {
MdmModuleDistributeTripartiteEntity mdmModuleDistributeTripartiteEntity = new MdmModuleDistributeTripartiteEntity();
mdmModuleDistributeTripartiteEntity.setCreate();
mdmModuleDistributeTripartiteEntity.setMdmId(mdmModuleEntity.getId());
@@ -1931,16 +1934,16 @@ public class MdmServiceImpl implements IMdmService {
}
}
} catch (Exception e) {
- logger.error("新增返回脚本解析保存三方id错误"+jsonResultEntity.getAttribute());
- saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(),mdmModuleDistributeEntity.getId(),"2", "转发失败", dbname, object.getString("id"), sysApplicationEntity.getName(),sysApplicationEntity.getId(), apiEntity.getApiName(),apiEntity.getId(), object.toJSONString(), type);
+ logger.error("新增返回脚本解析保存三方id错误" + jsonResultEntity.getAttribute());
+ saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(), mdmModuleDistributeEntity.getId(), "2", "转发失败", dbname, object.getString("id"), sysApplicationEntity.getName(), sysApplicationEntity.getId(), apiEntity.getApiName(), apiEntity.getId(), object.toJSONString(), type);
return BaseResult.getFailureMessageEntity("发送错误:" + jsonResultEntity.getMsg());
}
}
}
- saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(),mdmModuleDistributeEntity.getId(),"1", "发送成功", dbname, object.getString("id"), sysApplicationEntity.getName(),sysApplicationEntity.getId(), apiEntity.getApiName(),apiEntity.getId(), object.toJSONString(), type);
+ saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(), mdmModuleDistributeEntity.getId(), "1", "发送成功", dbname, object.getString("id"), sysApplicationEntity.getName(), sysApplicationEntity.getId(), apiEntity.getApiName(), apiEntity.getId(), object.toJSONString(), type);
return BaseResult.getSuccessMessageEntity("发送成功");
} else {
- saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(),mdmModuleDistributeEntity.getId(),"2", "转发失败", dbname, object.getString("id"), sysApplicationEntity.getName(),sysApplicationEntity.getId(), apiEntity.getApiName(),apiEntity.getId(), object.toJSONString(), type);
+ saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(), mdmModuleDistributeEntity.getId(), "2", "转发失败", dbname, object.getString("id"), sysApplicationEntity.getName(), sysApplicationEntity.getId(), apiEntity.getApiName(), apiEntity.getId(), object.toJSONString(), type);
return BaseResult.getFailureMessageEntity("发送错误:" + jsonResultEntity.getMsg());
}
}
@@ -2288,15 +2291,15 @@ public class MdmServiceImpl implements IMdmService {
post.setEntity(entity);
}
- logger.info("接口拼接querys信息:"+ querys);
+ logger.info("接口拼接querys信息:" + querys);
if (headers != null && headers.size() > 0) {
StringBuffer stringBuffer = new StringBuffer();
for (String key : headers.keySet()) {
stringBuffer.append(key).append("=").append(headers.get(key)).append("&");
}
- logger.info("接口拼接header信息:"+ stringBuffer);
+ logger.info("接口拼接header信息:" + stringBuffer);
}
- logger.info("接口拼接bodys信息:"+ bodys);
+ logger.info("接口拼接bodys信息:" + bodys);
response = closeableHttpClient.execute(post);
@@ -2341,9 +2344,9 @@ public class MdmServiceImpl implements IMdmService {
}
}
- private void saveMdmModuleSendLogEntity(Long mdmCode,String distributeId,String dataType,String remark,String dbname,String formmain_id, String target_app,String appID, String target_api,String apiId, String source_data, String option_type) throws Exception {
+ private void saveMdmModuleSendLogEntity(Long mdmCode, String distributeId, String dataType, String remark, String dbname, String formmain_id, String target_app, String appID, String target_api, String apiId, String source_data, String option_type) throws Exception {
MdmModuleSendLogEntity mdmModuleSendLogEntity = new MdmModuleSendLogEntity();
- mdmModuleSendLogEntity.setTableName(dbname+"_send_log");
+ mdmModuleSendLogEntity.setTableName(dbname + "_send_log");
mdmModuleSendLogEntity.setId(UUIDUtils.getUUID());
mdmModuleSendLogEntity.setDistributeId(distributeId);
mdmModuleSendLogEntity.setAppId(appID);
@@ -2376,18 +2379,18 @@ public class MdmServiceImpl implements IMdmService {
integrationTaskLivingDetailsEntity.setOrg_id("0");
integrationTaskLivingDetailsEntity.setCompanyId("0");
JSONObject aa = new JSONObject();
- aa.put("mdmCode",mdmCode);//主数据编码
- aa.put("documentRule",jsonObject.getString("document_rule"));//行数据的单据规则编码
- aa.put("distributeId",distributeId);//发送表id
- aa.put("type",option_type);//发送类型,1、新增2、修改3、删除
+ aa.put("mdmCode", mdmCode);//主数据编码
+ aa.put("documentRule", jsonObject.getString("document_rule"));//行数据的单据规则编码
+ aa.put("distributeId", distributeId);//发送表id
+ aa.put("type", option_type);//发送类型,1、新增2、修改3、删除
integrationTaskLivingDetailsEntity.setRootAppPk(aa.toJSONString());
integrationTaskLivingDetailsEntity.setRootAppBill(jsonObject.getString("document_rule"));
integrationTaskLivingDetailsEntity.setPluginId("MdmModulePlugin");
integrationTaskLivingDetailsEntity.setRootAppNewData(source_data);
integrationTaskLivingDetailsEntity.setNewTransmitInfo(remark);
- if("1".equals(dataType)){
+ if ("1".equals(dataType)) {
taskLivingDetailsService.saveLogToSuccess(integrationTaskLivingDetailsEntity);
- }else {
+ } else {
taskLivingDetailsService.saveLogToFail(integrationTaskLivingDetailsEntity);
}
@@ -2581,17 +2584,17 @@ public class MdmServiceImpl implements IMdmService {
update_status.setFiledsName("update_status");
update_status.setFiledsValue("0");
mdmDataFiledDtos.add(update_status);
- }else if(flag && "data_status".equals(fileds.get(i1).getEnName())) {
+ } else if (flag && "data_status".equals(fileds.get(i1).getEnName())) {
MdmDataFiledDto data_status = new MdmDataFiledDto();
data_status.setFiledsName("data_status");
data_status.setFiledsValue("F");
mdmDataFiledDtos.add(data_status);
- }else if(flag && "modify_user_id".equals(fileds.get(i1).getEnName())) {
+ } else if (flag && "modify_user_id".equals(fileds.get(i1).getEnName())) {
MdmDataFiledDto data_status = new MdmDataFiledDto();
data_status.setFiledsName("modify_user_id");
data_status.setFiledsValue("F");
//mdmDataFiledDtos.add(data_status);
- }else {
+ } else {
MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto();
mdmDataFiledDto.setFiledsName(fileds.get(i1).getEnName());
mdmDataFiledDto.setFiledsValue(jsonObject.getString(fileds.get(i1).getEnName()));
From 9b3c01c86dc5857bfe835d751d5092c469290e56 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Thu, 25 Jul 2024 09:40:05 +0800
Subject: [PATCH 02/26] =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E6=8C=89?=
=?UTF-8?q?=E9=92=AE=E6=8E=92=E5=BA=8F=E8=B0=83=E6=95=B4=EF=BC=8C=E4=BF=9D?=
=?UTF-8?q?=E5=AD=98=E5=88=B0=E8=8F=9C=E5=8D=95=E6=8C=89=E9=92=AE=E6=8E=92?=
=?UTF-8?q?=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/MdmModuleServiceImpl.java | 9 +
.../entity/SysPopedomOperateEntity.xml | 444 +++++++++---------
2 files changed, 241 insertions(+), 212 deletions(-)
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
index cedbf8a3..ab8ea9f8 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
@@ -2217,6 +2217,7 @@ public class MdmModuleServiceImpl extends BaseService i
flag = true;
sysButtonConfigEntities.get(i1).setSts("Y");
sysButtonConfigEntities.get(i1).setUpdate();
+ sysButtonConfigEntities.get(i1).setSorts(i+1L);
sysButtonConfigDao.update(sysButtonConfigEntities.get(i1));
if(sysPopedomOperateEntities != null && sysPopedomOperateEntities.size() > 0){
for (int i2 = 0; i2 < sysPopedomOperateEntities.size(); i2++) {
@@ -2243,6 +2244,7 @@ public class MdmModuleServiceImpl extends BaseService i
xz.setStyles("");
xz.setBtnFunction("new");
xz.setRemark("主数据新建按钮");
+ xz.setSorts(i+1L);
xz.setCreate();
sysButtonConfigDao.save(xz);
}
@@ -2257,6 +2259,8 @@ public class MdmModuleServiceImpl extends BaseService i
cz.setStyles("");
cz.setBtnFunction("resize");
cz.setRemark("主数据重置按钮");
+ cz.setSorts(i+1L);
+
cz.setCreate();
sysButtonConfigDao.save(cz);
}
@@ -2271,6 +2275,7 @@ public class MdmModuleServiceImpl extends BaseService i
cx.setStyles("");
cx.setBtnFunction("search");
cx.setRemark("主数据查询按钮");
+ cx.setSorts(i+1L);
cx.setCreate();
sysButtonConfigDao.save(cx);
}
@@ -2285,6 +2290,7 @@ public class MdmModuleServiceImpl extends BaseService i
xg.setStyles("");
xg.setBtnFunction("edit");
xg.setRemark("主数据修改按钮");
+ xg.setSorts(i+1L);
xg.setCreate();
sysButtonConfigDao.save(xg);
}
@@ -2299,6 +2305,7 @@ public class MdmModuleServiceImpl extends BaseService i
sc.setStyles("");
sc.setBtnFunction("dele");
sc.setRemark("主数据删除按钮");
+ sc.setSorts(i+1L);
sc.setCreate();
sysButtonConfigDao.save(sc);
}
@@ -2313,6 +2320,7 @@ public class MdmModuleServiceImpl extends BaseService i
ck.setStyles("");
ck.setBtnFunction("view");
ck.setRemark("主数据查看按钮");
+ ck.setSorts(i+1L);
ck.setCreate();
sysButtonConfigDao.save(ck);
}
@@ -2326,6 +2334,7 @@ public class MdmModuleServiceImpl extends BaseService i
xf.setStyles("");
xf.setBtnFunction("send");
xf.setRemark("主数据下发按钮");
+ xf.setSorts(i+1L);
xf.setCreate();
sysButtonConfigDao.save(xf);
}
diff --git a/service/src/main/java/com/hzya/frame/sysnew/popedomOperate/entity/SysPopedomOperateEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/popedomOperate/entity/SysPopedomOperateEntity.xml
index c36ceacf..76bda16f 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/popedomOperate/entity/SysPopedomOperateEntity.xml
+++ b/service/src/main/java/com/hzya/frame/sysnew/popedomOperate/entity/SysPopedomOperateEntity.xml
@@ -2,23 +2,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
id
,object_id
,menu_id
@@ -31,217 +32,236 @@
,modify_time
,sts
,org_id
- ,company_id
-
+ ,company_id
+
-
-
-
- select
-
- from sys_popedom_operate
-
- and id like concat('%',#{id},'%')
- and object_id like concat('%',#{objectId},'%')
- and menu_id like concat('%',#{menuId},'%')
- and operate like concat('%',#{operate},'%')
- and kind_id like concat('%',#{kindId},'%')
- and sorts like concat('%',#{sorts},'%')
- and create_user_id like concat('%',#{create_user_id},'%')
- and create_time like concat('%',#{create_time},'%')
- and modify_user_id like concat('%',#{modify_user_id},'%')
- and modify_time like concat('%',#{modify_time},'%')
- and sts like concat('%',#{sts},'%')
- and org_id like concat('%',#{org_id},'%')
- and company_id like concat('%',#{companyId},'%')
+
+ select
+
+ from sys_popedom_operate
+
+ and id like concat('%',#{id},'%')
+ and object_id like concat('%',#{objectId},'%')
+ and menu_id like concat('%',#{menuId},'%')
+ and operate like concat('%',#{operate},'%')
+ and kind_id like concat('%',#{kindId},'%')
+ and sorts like concat('%',#{sorts},'%')
+ and create_user_id like
+ concat('%',#{create_user_id},'%')
+
+ and create_time like concat('%',#{create_time},'%')
+ and modify_user_id like
+ concat('%',#{modify_user_id},'%')
+
+ and modify_time like concat('%',#{modify_time},'%')
+ and sts like concat('%',#{sts},'%')
+ and org_id like concat('%',#{org_id},'%')
+ and company_id like concat('%',#{companyId},'%')
and sts='Y'
-
- order by sorts asc
- order by ${sort} ${order}
-
+
+ order by sorts asc
+ order by ${sort} ${order}
+
-
-
- select
-
- from sys_popedom_operate
-
- or id = #{id}
- or object_id = #{objectId}
- or menu_id = #{menuId}
- or operate = #{operate}
- or kind_id = #{kindId}
- or sorts = #{sorts}
- or create_user_id = #{create_user_id}
- or create_time = #{create_time}
- or modify_user_id = #{modify_user_id}
- or modify_time = #{modify_time}
- or sts = #{sts}
- or org_id = #{org_id}
- or company_id = #{companyId}
+
+
+ select
+
+ from sys_popedom_operate
+
+ or id = #{id}
+ or object_id = #{objectId}
+ or menu_id = #{menuId}
+ or operate = #{operate}
+ or kind_id = #{kindId}
+ or sorts = #{sorts}
+ or create_user_id = #{create_user_id}
+ or create_time = #{create_time}
+ or modify_user_id = #{modify_user_id}
+ or modify_time = #{modify_time}
+ or sts = #{sts}
+ or org_id = #{org_id}
+ or company_id = #{companyId}
and sts='Y'
-
- order by sorts asc
- order by ${sort} ${order}
-
+
+ order by sorts asc
+ order by ${sort} ${order}
+
-
-
- insert into sys_popedom_operate(
-
- id ,
- object_id ,
- menu_id ,
- operate ,
- kind_id ,
- sorts ,
- create_user_id ,
- create_time ,
- modify_user_id ,
- modify_time ,
- sts ,
- org_id ,
- company_id ,
- sts,
-
- )values(
-
- #{id} ,
- #{objectId} ,
- #{menuId} ,
- #{operate} ,
- #{kindId} ,
- #{sorts} ,
- #{create_user_id} ,
- #{create_time} ,
- #{modify_user_id} ,
- #{modify_time} ,
- #{sts} ,
- #{org_id} ,
- #{companyId} ,
- 'Y',
-
- )
-
-
-
- insert into sys_popedom_operate(object_id, menu_id, operate, kind_id, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts)
- values
-
- (#{entity.objectId},#{entity.menuId},#{entity.operate},#{entity.kindId},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y')
-
-
-
-
- insert into sys_popedom_operate(object_id, menu_id, operate, kind_id, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id)
- values
-
- (#{entity.objectId},#{entity.menuId},#{entity.operate},#{entity.kindId},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId})
-
- on duplicate key update
- object_id = values(object_id),
- menu_id = values(menu_id),
- operate = values(operate),
- kind_id = values(kind_id),
- create_user_id = values(create_user_id),
- create_time = values(create_time),
- modify_user_id = values(modify_user_id),
- modify_time = values(modify_time),
- sts = values(sts),
- org_id = values(org_id),
- company_id = values(company_id)
-
-
-update sys_popedom_operate set
-
- object_id = #{objectId},
- menu_id = #{menuId},
- operate = #{operate},
- kind_id = #{kindId},
- create_user_id = #{create_user_id},
- create_time = #{create_time},
- modify_user_id = #{modify_user_id},
- modify_time = #{modify_time},
- sts = #{sts},
- org_id = #{org_id},
- company_id = #{companyId},
-
-where id = #{id}
-
-
-
-update sys_popedom_operate set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
-where id = #{id}
-
-
-
-update sys_popedom_operate set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
-
- and id = #{id}
- and object_id = #{objectId}
- and menu_id = #{menuId}
- and operate = #{operate}
- and kind_id = #{kindId}
- and sorts = #{sorts}
- and sts = #{sts}
- and company_id = #{companyId}
+
+
+ insert into sys_popedom_operate(
+
+ id ,
+ object_id ,
+ menu_id ,
+ operate ,
+ kind_id ,
+ sorts ,
+ create_user_id ,
+ create_time ,
+ modify_user_id ,
+ modify_time ,
+ sts ,
+ org_id ,
+ company_id ,
+ sts,
+
+ )values(
+
+ #{id} ,
+ #{objectId} ,
+ #{menuId} ,
+ #{operate} ,
+ #{kindId} ,
+ #{sorts} ,
+ #{create_user_id} ,
+ #{create_time} ,
+ #{modify_user_id} ,
+ #{modify_time} ,
+ #{sts} ,
+ #{org_id} ,
+ #{companyId} ,
+ 'Y',
+
+ )
+
+
+
+ insert into sys_popedom_operate(object_id, menu_id, operate, kind_id, create_user_id, create_time,
+ modify_user_id, modify_time, sts, org_id, company_id, sts)
+ values
+
+ (#{entity.objectId},#{entity.menuId},#{entity.operate},#{entity.kindId},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},
+ 'Y')
+
+
+
+
+ insert into sys_popedom_operate(object_id, menu_id, operate, kind_id, create_user_id, create_time,
+ modify_user_id, modify_time, sts, org_id, company_id)
+ values
+
+ (#{entity.objectId},#{entity.menuId},#{entity.operate},#{entity.kindId},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId})
+
+ on duplicate key update
+ object_id = values(object_id),
+ menu_id = values(menu_id),
+ operate = values(operate),
+ kind_id = values(kind_id),
+ create_user_id = values(create_user_id),
+ create_time = values(create_time),
+ modify_user_id = values(modify_user_id),
+ modify_time = values(modify_time),
+ sts = values(sts),
+ org_id = values(org_id),
+ company_id = values(company_id)
+
+
+
+ update sys_popedom_operate set
+
+ object_id = #{objectId},
+ menu_id = #{menuId},
+ operate = #{operate},
+ kind_id = #{kindId},
+ create_user_id = #{create_user_id},
+ create_time = #{create_time},
+ modify_user_id = #{modify_user_id},
+ modify_time = #{modify_time},
+ sts = #{sts},
+ org_id = #{org_id},
+ company_id = #{companyId},
+ sorts = #{sorts} ,
+
+ where id = #{id}
+
+
+
+ update sys_popedom_operate
+ set sts= 'N',
+ modify_time = #{modify_time},
+ modify_user_id = #{modify_user_id}
+ where id = #{id}
+
+
+
+ update sys_popedom_operate set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+
+ and id = #{id}
+ and object_id = #{objectId}
+ and menu_id = #{menuId}
+ and operate = #{operate}
+ and kind_id = #{kindId}
+ and sorts = #{sorts}
+ and sts = #{sts}
+ and company_id = #{companyId}
and sts='Y'
-
-
-
-
- delete from sys_popedom_operate where id = #{id}
-
+
+
+
+
+ delete
+ from sys_popedom_operate
+ where id = #{id}
+
From 63b0a26a65f9aec50be0db47c6f8aa28c504e01e Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Fri, 26 Jul 2024 10:00:38 +0800
Subject: [PATCH 03/26] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E9=93=BE?=
=?UTF-8?q?=E6=8E=A5=E6=8B=BC=E6=8E=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java | 2 +-
.../database/entity/SysApplicationDatabaseEntity.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java b/service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java
index 1e59eda9..22dc084e 100644
--- a/service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java
+++ b/service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java
@@ -160,7 +160,7 @@ public class DsDataSourceUtil {
return false;
}
} catch (Exception e) {
- logger.info("==================连接数据源失败===================");
+ logger.error("测试数据源失败:"+e.getMessage());
return false;
}
}
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.java b/service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.java
index 19aba575..73c69c8b 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.java
@@ -131,7 +131,8 @@ public class SysApplicationDatabaseEntity extends BaseEntity {
break;
case "2": //sqlsever
//jdbc:sqlserver://221.12.175.82:1433;DatabaseName=U8CLOUD;encrypt=false;trustServerCertificate=true
- sourceUrl.append("jdbc:jtds:sqlserver://").append(sourceIp).append(":").append(sourcePort).append("/").append(dbName).append(";encrypt=false;trustServerCertificate=true");
+ //sourceUrl.append("jdbc:jtds:sqlserver://").append(sourceIp).append(":").append(sourcePort).append("/").append(dbName).append(";encrypt=false;trustServerCertificate=true");
+ sourceUrl.append("jdbc:sqlserver://").append(sourceIp).append(":").append(sourcePort).append(";DatabaseName=").append(dbName).append(";encrypt=false;trustServerCertificate=true");
break;
case "3": //mysql
//jdbc:mysql://hzya.ufyct.com: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
From cf845501c092e5f6f046908b14626ba328e58e1d Mon Sep 17 00:00:00 2001
From: hecan <1718492867@qq.com>
Date: Mon, 29 Jul 2024 15:53:18 +0800
Subject: [PATCH 04/26] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=9A=E7=94=A8?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=A0=BC=E5=BC=8F=EF=BC=8C?=
=?UTF-8?q?=E9=81=BF=E5=85=8D=E4=B8=A4=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../comparison/service/IComparisonService.java | 9 +++++----
.../service/impl/ComparisonServiceImpl.java | 16 ++++++++--------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java
index 389458f5..f0ec04ba 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java
@@ -2,6 +2,7 @@ package com.hzya.frame.sysnew.comparison.service;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.github.pagehelper.PageInfo;
import com.hzya.frame.basedao.service.IBaseService;
import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity;
@@ -17,7 +18,7 @@ public interface IComparisonService extends IBaseService
//分页查询通用数据数据
@Override
- public JsonResultEntity queryEntityPage(JSONObject json) {
+ public Object queryEntityPage(JSONObject json) {
JSONObject jsonObject = json.getJSONObject("jsonStr");
if (jsonObject == null) {
return BaseResult.getFailureMessageEntity("数据为空,请先传递数据");
@@ -122,7 +122,7 @@ public class ComparisonServiceImpl extends BaseService
}
}
PageInfo pageInfo = new PageInfo(list);
- return BaseResult.getSuccessMessageEntity("查询成功", pageInfo);
+ return pageInfo;
} catch (Exception e) {
logger.info("查询通用数据错误:{}", e.getMessage());
return BaseResult.getFailureMessageEntity("查询失败");
@@ -133,7 +133,7 @@ public class ComparisonServiceImpl extends BaseService
//新增通用数据数据
@Override
- public JsonResultEntity saveEntity(JSONObject json) {
+ public Object saveEntity(JSONObject json) {
JSONObject jsonObject = json.getJSONObject("jsonStr");
if (jsonObject == null) {
return BaseResult.getFailureMessageEntity("数据为空,请先传递数据");
@@ -330,7 +330,7 @@ public class ComparisonServiceImpl extends BaseService
list.add(jsonObjectList);
//保存操作日志
controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),tableName+"_option_log","1");
- return BaseResult.getSuccessMessageEntity("保存成功", list);
+ return list;
} catch (Exception e) {
logger.info("保存通用数据时候错误:{}", e.getMessage());
//保存操作日志
@@ -345,7 +345,7 @@ public class ComparisonServiceImpl extends BaseService
//更新通用数据数据
@Override
- public JsonResultEntity updateEntity(JSONObject json) {
+ public Object updateEntity(JSONObject json) {
JSONObject jsonObject = json.getJSONObject("jsonStr");
if (jsonObject == null) {
return BaseResult.getFailureMessageEntity("数据为空,请先传递数据");
@@ -465,7 +465,7 @@ public class ComparisonServiceImpl extends BaseService
jsonObjects.add(jsonObjectList);
//保存操作日志
controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log","1");
- return BaseResult.getSuccessMessageEntity("更新成功", jsonObjects);
+ return jsonObjects;
}else{
return BaseResult.getFailureMessageEntity("更新失败");
}
@@ -487,7 +487,7 @@ public class ComparisonServiceImpl extends BaseService
//删除通用数据
@Override
- public JsonResultEntity deleteEntity(JSONObject json) {
+ public Object deleteEntity(JSONObject json) {
JSONObject jsonObject = json.getJSONObject("jsonStr");
if (jsonObject == null) {
return BaseResult.getFailureMessageEntity("数据为空,请先传递数据");
@@ -575,7 +575,7 @@ public class ComparisonServiceImpl extends BaseService
// controlsLogDaoimpl.saveControlsLog(comparisonDetailsEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log");
}
controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log","1");
- return BaseResult.getSuccessMessageEntity("删除成功",integer);
+ return integer;
}else{
return BaseResult.getFailureMessageEntity("删除失败","请查看data_id是否在表中存在");
}
From e1277beb608793e74fa4df631b16ae1a6e84eca8 Mon Sep 17 00:00:00 2001
From: hecan <1718492867@qq.com>
Date: Mon, 29 Jul 2024 16:16:18 +0800
Subject: [PATCH 05/26] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=94=E5=9B=9E?=
=?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/MasterDataServiceImpl.java | 23 ++++++++++---------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataServiceImpl.java
index 0ef63943..357a2ec6 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataServiceImpl.java
@@ -232,9 +232,8 @@ public class MasterDataServiceImpl extends BaseService
jsonObjectUser.put("mdmCode", mdmCode);
jsonStr.put("jsonStr", jsonObjectUser);
//先查询编码和名称查询是否存在
- JsonResultEntity jsonResultEntity = comparisonServiceimpl.queryEntityPage(jsonStr);
- Object attribute = jsonResultEntity.getAttribute();
- logger.info("得到的attribute值为:{}", attribute);
+ Object attribute = comparisonServiceimpl.queryEntityPage(jsonStr);
+ logger.info("得到的attribute值为:{}", jsonStr.toJSONString(attribute));
JSONObject jsonObjectAttribute = (JSONObject) JSON.toJSON(attribute);
JSONArray jsonArrayList = jsonObjectAttribute.getJSONArray("list");
//如果jsonArrayList为null,说明没有值,在表中不存在
@@ -250,20 +249,22 @@ public class MasterDataServiceImpl extends BaseService
hashMap.put("mdmCode", mdmCode);
hashMap.put("optionName", "数智中台");
jsonStr.put("jsonStr", hashMap);
- JsonResultEntity result = comparisonServiceimpl.saveEntity(jsonStr);
- if(!result.isFlag()){
- throw new BaseSystemException("主数据保存失败"+ result.getMsg());
- }
+ Object result = comparisonServiceimpl.saveEntity(jsonStr);
+ logger.info("新增结果为:{}", JSON.toJSONString(result));
+// if(!result.isFlag()){
+// throw new BaseSystemException("主数据保存失败"+ result.getMsg());
+// }
} else {
hashMap.put("appName","数智中台");
hashMap.put("appCode","800004");
hashMap.put("mdmCode", mdmCode);
hashMap.put("optionName", "数智中台");
jsonStr.put("jsonStr", hashMap);
- JsonResultEntity result = comparisonServiceimpl.updateEntity(jsonStr);
- if(!result.isFlag()){
- //throw new BaseSystemException("主数据更新失败"+ result.getMsg());
- }
+ Object result = comparisonServiceimpl.updateEntity(jsonStr);
+ logger.info("更新结果为:{}", JSON.toJSONString(result));
+// if(!result.isFlag()){
+// //throw new BaseSystemException("主数据更新失败"+ result.getMsg());
+// }
}
}
return null;
From bf511fcada3740d7aabd215bc0173398d7534ee5 Mon Sep 17 00:00:00 2001
From: hecan <1718492867@qq.com>
Date: Tue, 30 Jul 2024 10:09:27 +0800
Subject: [PATCH 06/26] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=94=E5=9B=9E?=
=?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/ComparisonServiceImpl.java | 21 +++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
index cc1809a1..9defee72 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
@@ -59,6 +59,7 @@ public class ComparisonServiceImpl extends BaseService
@Override
public Object queryEntityPage(JSONObject json) {
JSONObject jsonObject = json.getJSONObject("jsonStr");
+ JSONObject json1 = new JSONObject();
if (jsonObject == null) {
return BaseResult.getFailureMessageEntity("数据为空,请先传递数据");
}
@@ -122,7 +123,10 @@ public class ComparisonServiceImpl extends BaseService
}
}
PageInfo pageInfo = new PageInfo(list);
- return pageInfo;
+
+ json1.put("status","200");
+ json1.put("pageInfo",pageInfo);
+ return json1;
} catch (Exception e) {
logger.info("查询通用数据错误:{}", e.getMessage());
return BaseResult.getFailureMessageEntity("查询失败");
@@ -330,7 +334,10 @@ public class ComparisonServiceImpl extends BaseService
list.add(jsonObjectList);
//保存操作日志
controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),tableName+"_option_log","1");
- return list;
+ JSONObject json1 = new JSONObject();
+ json1.put("status","200");
+ json1.put("list",list);
+ return json1;
} catch (Exception e) {
logger.info("保存通用数据时候错误:{}", e.getMessage());
//保存操作日志
@@ -465,7 +472,10 @@ public class ComparisonServiceImpl extends BaseService
jsonObjects.add(jsonObjectList);
//保存操作日志
controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log","1");
- return jsonObjects;
+ JSONObject json1 = new JSONObject();
+ json1.put("status","200");
+ json1.put("list",jsonObjects);
+ return json1;
}else{
return BaseResult.getFailureMessageEntity("更新失败");
}
@@ -575,7 +585,10 @@ public class ComparisonServiceImpl extends BaseService
// controlsLogDaoimpl.saveControlsLog(comparisonDetailsEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log");
}
controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log","1");
- return integer;
+ JSONObject json1 = new JSONObject();
+ json1.put("status","200");
+ json1.put("integer",integer);
+ return json1;
}else{
return BaseResult.getFailureMessageEntity("删除失败","请查看data_id是否在表中存在");
}
From 7aed1aca105bbc43f5a69269f78ea5d679dc215d Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Tue, 30 Jul 2024 10:27:16 +0800
Subject: [PATCH 07/26] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E9=93=B6=E8=A1=8C?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E5=88=86?=
=?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/INingboBankTreasuryService.java | 10 ++-
.../impl/NingboBankTreasuryServiceImpl.java | 63 +++++++++++++++++++
.../impl/SysApplicationServiceImpl.java | 20 +++++-
.../entity/SysMessageManageLogEntity.xml | 10 ++-
4 files changed, 100 insertions(+), 3 deletions(-)
diff --git a/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/INingboBankTreasuryService.java b/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/INingboBankTreasuryService.java
index d4f0b098..c8985f5d 100644
--- a/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/INingboBankTreasuryService.java
+++ b/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/INingboBankTreasuryService.java
@@ -10,13 +10,21 @@ public interface INingboBankTreasuryService {
/**
* @Author lvleigang
- * @Description 单笔查证接口
+ * @Description 发送宁波银行
* @Date 4:45 下午 2024/7/9
* @param jsonObject
* @return com.hzya.frame.web.entity.JsonResultEntity
**/
Object sendNbBank(JSONObject jsonObject);
+ /**
+ * @Author lvleigang
+ * @Description 发送宁波银行下载文件
+ * @Date 4:45 下午 2024/7/9
+ * @param jsonObject
+ * @return com.hzya.frame.web.entity.JsonResultEntity
+ **/
+ Object sendNbBankFileDownload(JSONObject jsonObject);
/**
*
* @content 此方法获取初始化参数,拼接请求参数
diff --git a/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/impl/NingboBankTreasuryServiceImpl.java b/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/impl/NingboBankTreasuryServiceImpl.java
index 488eb869..86e1257b 100644
--- a/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/impl/NingboBankTreasuryServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/impl/NingboBankTreasuryServiceImpl.java
@@ -11,6 +11,7 @@ import com.hzya.frame.web.entity.JsonResultEntity;
import com.nbcb.sdk.OpenSDK;
import com.nbcb.sdk.aes.exception.SDKException;
import com.nbcb.sdk.aes.param.ConfigParam;
+import com.nbcb.sdk.file.FileDownloadResponse;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -81,6 +82,68 @@ public class NingboBankTreasuryServiceImpl implements INingboBankTreasuryService
}
}
+
+
+ /**
+ * @param jsonObject
+ * @return com.hzya.frame.web.entity.JsonResultEntity
+ * @Author lvleigang
+ * @Description 发送宁波银行下载文件
+ * @Date 4:45 下午 2024/7/9
+ **/
+ @Override
+ public Object sendNbBankFileDownload(JSONObject jsonObject) {
+ JSONObject returnJson = new JSONObject();
+ JSONObject entity = getstrObj("jsonStr", jsonObject);
+ String dataJson = entity.getString("Data");
+ JSONObject data = JSONObject.parseObject(dataJson);
+ JSONObject dataFileid = data.getJSONObject("Data");
+ String appKey = entity.getString("appKey");
+ String privateKey = entity.getString("privateKey");
+ String publicUrl = entity.getString("publicUrl");
+ String publicKey = entity.getString("publicKey");
+ String productID = entity.getString("productID");
+ String serviceID = entity.getString("serviceID");
+ //初始化宁波银行OpenSDK
+ try {
+ ConfigParam configParam = new ConfigParam(privateKey,publicUrl,appKey,publicKey,10000,20000);
+ OpenSDK.dynamicInit(configParam,true);
+ } catch (SDKException e) {
+ logger.error("初始化宁波银行OpenSDK错误:{}",e.getMessage());
+ returnJson.put("retCode","9999");
+ returnJson.put("retMsg","初始化宁波银行OpenSDK错误");
+ return returnJson;
+ }
+ //发送数据
+ try {
+ FileDownloadResponse returnData = OpenSDK.sendFileDownload(productID,"open-filegateway",dataFileid.getString("fileId"),null);
+ if(returnData == null || "".equals(returnData)){
+ returnJson.put("retCode","9999");
+ returnJson.put("retMsg","发送宁波银行OpenSDK返回错误");
+ return returnJson;
+ }
+ try {
+
+ //returnJson = JSONObject.parseObject(returnData);
+ //JSONObject retData = returnJson.getJSONObject("Data");
+ String retCode = returnData.getRetCode();
+ String retMsg = returnData.getRetMsg();
+ returnJson.put("data",returnData.getData());
+ returnJson.put("retCode",retCode);
+ returnJson.put("retMsg",retMsg);
+ return returnJson;
+ } catch (Exception e) {
+ returnJson.put("retCode","9999");
+ returnJson.put("retMsg","发送宁波银行OpenSDK返回转换Json错误");
+ return returnJson;
+ }
+ } catch (Exception e) {
+ returnJson.put("retCode","9999");
+ returnJson.put("retMsg","发送宁波银行OpenSDK错误");
+ return returnJson;
+ }
+ }
+
/**
* @param entity
* @content 此方法获取初始化参数,拼接请求参数
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
index dcbab68a..30d56d10 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
@@ -2099,7 +2099,25 @@ public class SysApplicationServiceImpl extends BaseService
select
- from sys_message_manage_log
+ from
+
+
+ sys_message_manage_log_success
+
+
+ sys_message_manage_log
+
+
and id = #{id}
and message_manage_id = #{messageManageId}
From 279dff107d25b45e8ddedb1b1261f1216bad38c1 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Wed, 31 Jul 2024 14:42:09 +0800
Subject: [PATCH 08/26] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E9=93=B6=E8=A1=8C?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E5=88=86?=
=?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/NingboBankTreasuryServiceImpl.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/impl/NingboBankTreasuryServiceImpl.java b/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/impl/NingboBankTreasuryServiceImpl.java
index 86e1257b..0b107a15 100644
--- a/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/impl/NingboBankTreasuryServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/ningboBankTreasury/service/impl/NingboBankTreasuryServiceImpl.java
@@ -89,6 +89,7 @@ public class NingboBankTreasuryServiceImpl implements INingboBankTreasuryService
* @return com.hzya.frame.web.entity.JsonResultEntity
* @Author lvleigang
* @Description 发送宁波银行下载文件
+ *
* @Date 4:45 下午 2024/7/9
**/
@Override
From 4129d738dfb48a6db037490dcbccc15092e5da74 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Thu, 1 Aug 2024 08:50:26 +0800
Subject: [PATCH 09/26] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BB=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84=E4=B8=8A=E7=BA=A7?=
=?UTF-8?q?=E5=85=B3=E8=81=94=EF=BC=8C=E5=BC=95=E7=94=A8=E8=A1=A8=E5=8F=AA?=
=?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=B8=8A=E7=BA=A7i?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../plugin/MdmModulePluginInitializer.java | 2 +-
.../com/hzya/frame/mdm/entity/MdmDataDto.java | 9 +
.../mdm/mdmModule/dao/IMdmModuleDao.java | 2 +
.../mdmModule/dao/impl/MdmModuleDaoImpl.java | 7 +-
.../mdm/mdmModule/entity/MdmModuleEntity.xml | 23 +-
.../dao/IMdmModuleDbFiledsRuleDao.java | 7 +-
.../impl/MdmModuleDbFiledsRuleDaoImpl.java | 10 +
.../entity/MdmModuleDbFiledsRuleEntity.xml | 559 ++++++++++--------
.../mdm/service/impl/MdmServiceImpl.java | 99 ++++
9 files changed, 455 insertions(+), 263 deletions(-)
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
index 3657beac..36c5ee81 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
@@ -473,7 +473,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
//查询主数据
MdmModuleEntity queryMdmModuleEntity = new MdmModuleEntity();
queryMdmModuleEntity.setSts("Y");
- queryMdmModuleEntity.setMdmCode(10004L);
+ queryMdmModuleEntity.setMdmCode(10021L);
List mdmModuleEntities = mdmModuleDao.queryBase(queryMdmModuleEntity);
if(mdmModuleEntities == null || mdmModuleEntities.size() == 0){
return BaseResult.getSuccessMessageEntity("主数据未设置,不需要下发");
diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataDto.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataDto.java
index 0370431c..34db1f03 100644
--- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataDto.java
+++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataDto.java
@@ -7,6 +7,7 @@ import java.util.List;
public class MdmDataDto {
+ private String mdmId;
private String id;
private String tableName;
private String documentRule;
@@ -65,5 +66,13 @@ public class MdmDataDto {
public void setDbType(String dbType) {
this.dbType = dbType;
}
+
+ public String getMdmId() {
+ return mdmId;
+ }
+
+ public void setMdmId(String mdmId) {
+ this.mdmId = mdmId;
+ }
}
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java
index 9a3aca15..9d683008 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java
@@ -64,5 +64,7 @@ public interface IMdmModuleDao extends IBaseDao {
* @return java.util.List
**/
List queryMdMFields(Map maps);
+
+ void updataTreeUpData(Map updateMaps);
}
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java
index 234d5dad..750b0824 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java
@@ -162,7 +162,7 @@ public class MdmModuleDaoImpl extends MybatisGenericDao
}
@Override
public List queryMdmSTs(Map maps) {
- List o = (List) super.selectList(getSqlIdPrifx() + "queryMdmST", maps);
+ List o = (List) super.selectList(getSqlIdPrifx() + "queryMdmSTs", maps);
return o;
}
@@ -171,6 +171,11 @@ public class MdmModuleDaoImpl extends MybatisGenericDao
super.update(getSqlIdPrifx() + "updateMdmSTs", maps);
}
+ @Override
+ public void updataTreeUpData(Map maps) {
+ super.update(getSqlIdPrifx() + "updataTreeUpData", maps);
+ }
+
@Override
public List queryMdMFields(Map maps) {
List o = (List) super.selectList(getSqlIdPrifx() + "queryMdMFields", maps);
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
index 63dfa9c2..e7ea39a9 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
@@ -397,6 +397,9 @@ where id = #{id}
`company_id` varchar(50) DEFAULT NULL COMMENT '公司id',
`data_type` varchar(50) DEFAULT NULL COMMENT '状态 1、成功2、失败',
`remark` varchar(255) DEFAULT NULL COMMENT '备注',
+ `distribute_id` varchar(50) DEFAULT NULL COMMENT 'distribute_id',
+ `api_id` varchar(50) DEFAULT NULL COMMENT 'apiid',
+ `app_id` varchar(50) DEFAULT NULL COMMENT 'app_id',
PRIMARY KEY (`sorts`,`id`) USING BTREE
@@ -933,7 +936,7 @@ where id = #{id}
WHERE table_name = #{tableName}
-
+
select
@@ -1005,9 +1008,9 @@ where id = #{id}
and sts = 'Y'
+ order by sorts asc
limit #{size}
- order by sorts asc
@@ -1030,6 +1033,8 @@ where id = #{id}
update ${tableName} set
, add_status = #{addStatus}
+ , update_status = #{updateStatus}
+ , delete_status = #{deleteStatus}
,modify_time = now()
@@ -1037,5 +1042,19 @@ where id = #{id}
and data_status = #{dataStatus}
+
+
+
+ UPDATE ${tableName}
+ SET ${upFiled} = CONCAT(#{newData},SUBSTRING_INDEX( ${upFiled}, #{oldData},- 1 )),
+ modify_time = now(),
+ modify_user_id = #{modify_user_id},
+ data_status = 'F',
+ update_status = '0'
+ WHERE
+ ${upFiled} LIKE concat(#{oldData},'%')
+ AND sts = 'Y'
+ AND data_status != 'N'
+
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/IMdmModuleDbFiledsRuleDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/IMdmModuleDbFiledsRuleDao.java
index ab7def4b..b63f4881 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/IMdmModuleDbFiledsRuleDao.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/IMdmModuleDbFiledsRuleDao.java
@@ -1,7 +1,10 @@
package com.hzya.frame.mdm.mdmModuleDbFiledsRule.dao;
import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity;
-import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.basedao.dao.IBaseDao;
+
+import java.util.List;
+import java.util.Map;
/**
* 模版数据库字段规则表(mdm_module_db_fileds_rule: table)表数据库访问层
@@ -12,5 +15,7 @@ import com.hzya.frame.basedao.dao.IBaseDao;
public interface IMdmModuleDbFiledsRuleDao extends IBaseDao {
Integer queryUserMdm(MdmModuleDbFiledsRuleEntity queryCount);
+
+ List queryServiceQuote(Map maps);
}
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/impl/MdmModuleDbFiledsRuleDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/impl/MdmModuleDbFiledsRuleDaoImpl.java
index 2f11bed8..b1390ab1 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/impl/MdmModuleDbFiledsRuleDaoImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/impl/MdmModuleDbFiledsRuleDaoImpl.java
@@ -4,6 +4,10 @@ import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEnti
import com.hzya.frame.mdm.mdmModuleDbFiledsRule.dao.IMdmModuleDbFiledsRuleDao;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
+
+import java.util.List;
+import java.util.Map;
+
/**
* 模版数据库字段规则表(MdmModuleDbFiledsRule)表数据库访问层
*
@@ -18,5 +22,11 @@ public class MdmModuleDbFiledsRuleDaoImpl extends MybatisGenericDao queryServiceQuote(Map maps) {
+ List o = (List) super.selectList(getSqlIdPrifx() + "queryServiceQuote", maps);
+ return o;
+ }
}
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.xml
index 2c2213f8..30f2c620 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.xml
@@ -2,27 +2,28 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
id
,mdm_id
,form_name
@@ -39,261 +40,303 @@
,modify_time
,sts
,org_id
- ,company_id
-
-
-
- select
-
- from mdm_module_db_fileds_rule
-
- and id = #{id}
- and mdm_id = #{mdmId}
- and form_name = #{formName}
- and db_id = #{dbId}
- and filed_id = #{filedId}
- and rule_name = #{ruleName}
- and rule_code = #{ruleCode}
- and rule_value = #{ruleValue}
- and rule_type = #{ruleType}
- and sorts = #{sorts}
- and create_user_id = #{create_user_id}
- and create_time = #{create_time}
- and modify_user_id = #{modify_user_id}
- and modify_time = #{modify_time}
- and sts = #{sts}
- and org_id = #{org_id}
- and company_id = #{companyId}
+ ,company_id
+
+
+
+ select
+
+ from mdm_module_db_fileds_rule
+
+ and id = #{id}
+ and mdm_id = #{mdmId}
+ and form_name = #{formName}
+ and db_id = #{dbId}
+ and filed_id = #{filedId}
+ and rule_name = #{ruleName}
+ and rule_code = #{ruleCode}
+ and rule_value = #{ruleValue}
+ and rule_type = #{ruleType}
+ and sorts = #{sorts}
+ and create_user_id = #{create_user_id}
+ and create_time = #{create_time}
+ and modify_user_id = #{modify_user_id}
+ and modify_time = #{modify_time}
+ and sts = #{sts}
+ and org_id = #{org_id}
+ and company_id = #{companyId}
and sts='Y'
-
- order by sorts asc
- order by ${sort} ${order}
-
-
-
-
- select count(1) from mdm_module_db_fileds_rule
-
- and id = #{id}
- and mdm_id = #{mdmId}
- and form_name = #{formName}
- and db_id = #{dbId}
- and filed_id = #{filedId}
- and rule_name = #{ruleName}
- and rule_code = #{ruleCode}
- and rule_value = #{ruleValue}
- and rule_type = #{ruleType}
- and sorts = #{sorts}
- and create_user_id = #{create_user_id}
- and create_time = #{create_time}
- and modify_user_id = #{modify_user_id}
- and modify_time = #{modify_time}
- and sts = #{sts}
- and org_id = #{org_id}
- and company_id = #{companyId}
+
+ order by sorts asc
+ order by ${sort} ${order}
+
+
+
+
+ select count(1) from mdm_module_db_fileds_rule
+
+ and id = #{id}
+ and mdm_id = #{mdmId}
+ and form_name = #{formName}
+ and db_id = #{dbId}
+ and filed_id = #{filedId}
+ and rule_name = #{ruleName}
+ and rule_code = #{ruleCode}
+ and rule_value = #{ruleValue}
+ and rule_type = #{ruleType}
+ and sorts = #{sorts}
+ and create_user_id = #{create_user_id}
+ and create_time = #{create_time}
+ and modify_user_id = #{modify_user_id}
+ and modify_time = #{modify_time}
+ and sts = #{sts}
+ and org_id = #{org_id}
+ and company_id = #{companyId}
and sts='Y'
-
- order by sorts asc
- order by ${sort} ${order}
+
+ order by sorts asc
+ order by ${sort} ${order}
-
- select
-
- from mdm_module_db_fileds_rule
-
- and id like concat('%',#{id},'%')
- and mdm_id like concat('%',#{mdmId},'%')
- and form_name like concat('%',#{formName},'%')
- and db_id like concat('%',#{dbId},'%')
- and filed_id like concat('%',#{filedId},'%')
- and rule_name like concat('%',#{ruleName},'%')
- and rule_code like concat('%',#{ruleCode},'%')
- and rule_value like concat('%',#{ruleValue},'%')
- and rule_type like concat('%',#{ruleType},'%')
- and sorts like concat('%',#{sorts},'%')
- and create_user_id like concat('%',#{create_user_id},'%')
- and create_time like concat('%',#{create_time},'%')
- and modify_user_id like concat('%',#{modify_user_id},'%')
- and modify_time like concat('%',#{modify_time},'%')
- and sts like concat('%',#{sts},'%')
- and org_id like concat('%',#{org_id},'%')
- and company_id like concat('%',#{companyId},'%')
+
+ select
+
+ from mdm_module_db_fileds_rule
+
+ and id like concat('%',#{id},'%')
+ and mdm_id like concat('%',#{mdmId},'%')
+ and form_name like concat('%',#{formName},'%')
+ and db_id like concat('%',#{dbId},'%')
+ and filed_id like concat('%',#{filedId},'%')
+ and rule_name like concat('%',#{ruleName},'%')
+ and rule_code like concat('%',#{ruleCode},'%')
+ and rule_value like concat('%',#{ruleValue},'%')
+ and rule_type like concat('%',#{ruleType},'%')
+ and sorts like concat('%',#{sorts},'%')
+ and create_user_id like
+ concat('%',#{create_user_id},'%')
+
+ and create_time like concat('%',#{create_time},'%')
+ and modify_user_id like
+ concat('%',#{modify_user_id},'%')
+
+ and modify_time like concat('%',#{modify_time},'%')
+ and sts like concat('%',#{sts},'%')
+ and org_id like concat('%',#{org_id},'%')
+ and company_id like concat('%',#{companyId},'%')
and sts='Y'
-
- order by sorts asc
- order by ${sort} ${order}
-
+
+ order by sorts asc
+ order by ${sort} ${order}
+
-
-
- select
-
- from mdm_module_db_fileds_rule
-
- or id = #{id}
- or mdm_id = #{mdmId}
- or form_name = #{formName}
- or db_id = #{dbId}
- or filed_id = #{filedId}
- or rule_name = #{ruleName}
- or rule_code = #{ruleCode}
- or rule_value = #{ruleValue}
- or rule_type = #{ruleType}
- or sorts = #{sorts}
- or create_user_id = #{create_user_id}
- or create_time = #{create_time}
- or modify_user_id = #{modify_user_id}
- or modify_time = #{modify_time}
- or sts = #{sts}
- or org_id = #{org_id}
- or company_id = #{companyId}
+
+
+ select
+
+ from mdm_module_db_fileds_rule
+
+ or id = #{id}
+ or mdm_id = #{mdmId}
+ or form_name = #{formName}
+ or db_id = #{dbId}
+ or filed_id = #{filedId}
+ or rule_name = #{ruleName}
+ or rule_code = #{ruleCode}
+ or rule_value = #{ruleValue}
+ or rule_type = #{ruleType}
+ or sorts = #{sorts}
+ or create_user_id = #{create_user_id}
+ or create_time = #{create_time}
+ or modify_user_id = #{modify_user_id}
+ or modify_time = #{modify_time}
+ or sts = #{sts}
+ or org_id = #{org_id}
+ or company_id = #{companyId}
and sts='Y'
-
- order by sorts asc
- order by ${sort} ${order}
-
+
+ order by sorts asc
+ order by ${sort} ${order}
+
-
-
- insert into mdm_module_db_fileds_rule(
-
- id ,
- mdm_id ,
- form_name ,
- db_id ,
- filed_id ,
- rule_name ,
- rule_code ,
- rule_value ,
- rule_type ,
- sorts ,
- create_user_id ,
- create_time ,
- modify_user_id ,
- modify_time ,
- sts ,
- org_id ,
- company_id ,
- sts,
-
- )values(
-
- #{id} ,
- #{mdmId} ,
- #{formName} ,
- #{dbId} ,
- #{filedId} ,
- #{ruleName} ,
- #{ruleCode} ,
- #{ruleValue} ,
- #{ruleType} ,
- #{sorts} ,
- #{create_user_id} ,
- #{create_time} ,
- #{modify_user_id} ,
- #{modify_time} ,
- #{sts} ,
- #{org_id} ,
- #{companyId} ,
- 'Y',
-
- )
-
-
-
- insert into mdm_module_db_fileds_rule(mdm_id, form_name, db_id, filed_id, rule_name, rule_code, rule_value, rule_type, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts)
- values
-
- (#{entity.mdmId},#{entity.formName},#{entity.dbId},#{entity.filedId},#{entity.ruleName},#{entity.ruleCode},#{entity.ruleValue},#{entity.ruleType},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y')
-
-
-
-
- insert into mdm_module_db_fileds_rule(mdm_id, form_name, db_id, filed_id, rule_name, rule_code, rule_value, rule_type, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id)
- values
-
- (#{entity.mdmId},#{entity.formName},#{entity.dbId},#{entity.filedId},#{entity.ruleName},#{entity.ruleCode},#{entity.ruleValue},#{entity.ruleType},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId})
-
- on duplicate key update
- mdm_id = values(mdm_id),
- form_name = values(form_name),
- db_id = values(db_id),
- filed_id = values(filed_id),
- rule_name = values(rule_name),
- rule_code = values(rule_code),
- rule_value = values(rule_value),
- rule_type = values(rule_type),
- create_user_id = values(create_user_id),
- create_time = values(create_time),
- modify_user_id = values(modify_user_id),
- modify_time = values(modify_time),
- sts = values(sts),
- org_id = values(org_id),
- company_id = values(company_id)
-
-
-update mdm_module_db_fileds_rule set
-
- mdm_id = #{mdmId},
- form_name = #{formName},
- db_id = #{dbId},
- filed_id = #{filedId},
- rule_name = #{ruleName},
- rule_code = #{ruleCode},
- rule_value = #{ruleValue},
- rule_type = #{ruleType},
- create_user_id = #{create_user_id},
- create_time = #{create_time},
- modify_user_id = #{modify_user_id},
- modify_time = #{modify_time},
- sts = #{sts},
- org_id = #{org_id},
- company_id = #{companyId},
-
-where id = #{id}
-
-
-
-update mdm_module_db_fileds_rule set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
-where id = #{id}
-
-
-
-update mdm_module_db_fileds_rule set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
-
- and id = #{id}
- and mdm_id = #{mdmId}
- and form_name = #{formName}
- and db_id = #{dbId}
- and filed_id = #{filedId}
- and rule_name = #{ruleName}
- and rule_code = #{ruleCode}
- and rule_value = #{ruleValue}
- and rule_type = #{ruleType}
- and sorts = #{sorts}
- and sts = #{sts}
- and company_id = #{companyId}
+
+
+ insert into mdm_module_db_fileds_rule(
+
+ id ,
+ mdm_id ,
+ form_name ,
+ db_id ,
+ filed_id ,
+ rule_name ,
+ rule_code ,
+ rule_value ,
+ rule_type ,
+ sorts ,
+ create_user_id ,
+ create_time ,
+ modify_user_id ,
+ modify_time ,
+ sts ,
+ org_id ,
+ company_id ,
+ sts,
+
+ )values(
+
+ #{id} ,
+ #{mdmId} ,
+ #{formName} ,
+ #{dbId} ,
+ #{filedId} ,
+ #{ruleName} ,
+ #{ruleCode} ,
+ #{ruleValue} ,
+ #{ruleType} ,
+ #{sorts} ,
+ #{create_user_id} ,
+ #{create_time} ,
+ #{modify_user_id} ,
+ #{modify_time} ,
+ #{sts} ,
+ #{org_id} ,
+ #{companyId} ,
+ 'Y',
+
+ )
+
+
+
+ insert into mdm_module_db_fileds_rule(mdm_id, form_name, db_id, filed_id, rule_name, rule_code, rule_value,
+ rule_type, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts)
+ values
+
+ (#{entity.mdmId},#{entity.formName},#{entity.dbId},#{entity.filedId},#{entity.ruleName},#{entity.ruleCode},#{entity.ruleValue},#{entity.ruleType},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},
+ 'Y')
+
+
+
+
+ insert into mdm_module_db_fileds_rule(mdm_id, form_name, db_id, filed_id, rule_name, rule_code, rule_value,
+ rule_type, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id)
+ values
+
+ (#{entity.mdmId},#{entity.formName},#{entity.dbId},#{entity.filedId},#{entity.ruleName},#{entity.ruleCode},#{entity.ruleValue},#{entity.ruleType},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId})
+
+ on duplicate key update
+ mdm_id = values(mdm_id),
+ form_name = values(form_name),
+ db_id = values(db_id),
+ filed_id = values(filed_id),
+ rule_name = values(rule_name),
+ rule_code = values(rule_code),
+ rule_value = values(rule_value),
+ rule_type = values(rule_type),
+ create_user_id = values(create_user_id),
+ create_time = values(create_time),
+ modify_user_id = values(modify_user_id),
+ modify_time = values(modify_time),
+ sts = values(sts),
+ org_id = values(org_id),
+ company_id = values(company_id)
+
+
+
+ update mdm_module_db_fileds_rule set
+
+ mdm_id = #{mdmId},
+ form_name = #{formName},
+ db_id = #{dbId},
+ filed_id = #{filedId},
+ rule_name = #{ruleName},
+ rule_code = #{ruleCode},
+ rule_value = #{ruleValue},
+ rule_type = #{ruleType},
+ create_user_id = #{create_user_id},
+ create_time = #{create_time},
+ modify_user_id = #{modify_user_id},
+ modify_time = #{modify_time},
+ sts = #{sts},
+ org_id = #{org_id},
+ company_id = #{companyId},
+
+ where id = #{id}
+
+
+
+ update mdm_module_db_fileds_rule
+ set sts= 'N',
+ modify_time = #{modify_time},
+ modify_user_id = #{modify_user_id}
+ where id = #{id}
+
+
+
+ update mdm_module_db_fileds_rule set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+
+ and id = #{id}
+ and mdm_id = #{mdmId}
+ and form_name = #{formName}
+ and db_id = #{dbId}
+ and filed_id = #{filedId}
+ and rule_name = #{ruleName}
+ and rule_code = #{ruleCode}
+ and rule_value = #{ruleValue}
+ and rule_type = #{ruleType}
+ and sorts = #{sorts}
+ and sts = #{sts}
+ and company_id = #{companyId}
and sts='Y'
-
-
-
-
- delete from mdm_module_db_fileds_rule where id = #{id}
-
+
+
+
+
+ delete
+ from mdm_module_db_fileds_rule
+ where id = #{id}
+
-
- select count(1) from mdm_module_db_fileds_rule
+
+ select count(1) from mdm_module_db_fileds_rule
- and mdm_id != #{mdmId}
- and rule_code = #{ruleCode}
- and rule_value = #{ruleValue}
+ and mdm_id != #{mdmId}
+ and rule_code = #{ruleCode}
+ and rule_value = #{ruleValue}
and sts='Y'
+
+
+ SELECT filed_id,
+ db_id,
+ mdm_id
+ from (
+ SELECT filed_id,
+ db_id,
+ mdm_id,
+ COUNT(*) as num
+ FROM mdm_module_db_fileds_rule
+ WHERE `sts` = 'Y'
+ and (
+ (rule_code = 'type' and rule_value = 'treeselect')
+ or (rule_code = 'service' and rule_value = #{service})
+ or (rule_code = 'upId' and rule_value = #{upId})
+ )
+ GROUP BY filed_id, db_id, mdm_id) a
+ WHERE a.num = 3
+
diff --git a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
index b1ad3001..d3a6b263 100644
--- a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
@@ -2537,6 +2537,7 @@ public class MdmServiceImpl implements IMdmService {
JSONObject jsonObject = saveData.getJSONObject(mdmModuleDbEntityList.get(i).getDbName());
//保存数据
MdmDataDto mdmDataDto = new MdmDataDto();
+ mdmDataDto.setMdmId(mdmModuleEntity.getId());
mdmDataDto.setTableName(mdmModuleDbEntityList.get(i).getDbName());
MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity1 = new MdmModuleDbFiledsEntity();
mdmModuleDbFiledsEntity1.setMdmId(mdmModuleEntity.getId());
@@ -2610,7 +2611,104 @@ public class MdmServiceImpl implements IMdmService {
if (flag) {
mdmDataDto.setId(jsonObject.getString("id"));
id = jsonObject.getString("id");
+ boolean asdasd = false;
+ if(asdasd){
+ //查询是否设置的树形
+ MdmModuleViewEntity mdmModuleViewEntity = new MdmModuleViewEntity();
+ mdmModuleViewEntity.setMdmId(mdmModuleEntity.getId());
+ mdmModuleViewEntity.setViewName("1");
+ mdmModuleViewEntity.setSts("Y");
+ List moduleViewEntityList = mdmModuleViewDao.queryBase(mdmModuleViewEntity);
+ if (moduleViewEntityList != null && moduleViewEntityList.size() == 1) {
+ mdmModuleViewEntity = moduleViewEntityList.get(0);
+ //查询数据
+ Map queryData = new HashMap<>();
+ queryData.put("tableName", mdmDataDto.getTableName());//表名
+ queryData.put("detailFlag", false);//是否明细
+ queryData.put("id", id);//字段
+ HashMap datas = mdmModuleDbDao.getServiceDataById(queryData);
+ convertKeysToLowerCase(datas);
+ //对比值是否有修改
+ boolean upFlag = false;
+ String oldData = "";
+ String newData = "";
+
+ for (int i1 = 0; i1 < mdmDataFiledDtos.size(); i1++) {
+ if (mdmDataFiledDtos.get(i1).getFiledsName().equals(mdmModuleViewEntity.getUpIdFiled())) {
+ newData = mdmDataFiledDtos.get(i1).getFiledsValue();
+ oldData = datas.get(mdmDataFiledDtos.get(i1).getFiledsName()).toString();
+
+ if (mdmDataFiledDtos.get(i1).getFiledsValue().equals(datas.get(mdmDataFiledDtos.get(i1).getFiledsName()).toString())) {
+ upFlag = true;
+ break;
+ }
+ }
+ }
+ if (upFlag) {
+ //查询引用地方
+ Map maps = new HashMap<>();
+ maps.put("service",mdmDataDto.getTableName());
+ maps.put("upId",mdmModuleViewEntity.getUpIdFiled());
+ //maps.put("mdmId",mdmModuleEntity.getId());
+ List mdmModuleDbFiledsRuleEntities = mdmModuleDbFiledsRuleDao.queryServiceQuote(maps);
+ if(mdmModuleDbFiledsRuleEntities != null && mdmModuleDbFiledsRuleEntities.size() > 0){
+ for (int i1 = 0; i1 < mdmModuleDbFiledsRuleEntities.size(); i1++) {
+ //查询字段
+ String upFiled = "";
+
+ MdmModuleDbFiledsEntity moduleDbFiledsEntity = new MdmModuleDbFiledsEntity();
+ moduleDbFiledsEntity.setMdmId(mdmModuleDbFiledsRuleEntities.get(i1).getMdmId());
+ moduleDbFiledsEntity.setSts("Y");
+ List mdmModuleDbFiledsEntities = mdmServiceCache.queryMdmModuleDbFileds(moduleDbFiledsEntity);
+ if(mdmModuleDbFiledsEntities != null && mdmModuleDbFiledsEntities.size() > 0){
+ for (int i2 = 0; i2 < mdmModuleDbFiledsEntities.size(); i2++) {
+ if(mdmModuleDbFiledsRuleEntities.get(i1).getFiledId().equals(mdmModuleDbFiledsEntities.get(i2).getId())){
+ upFiled = mdmModuleDbFiledsEntities.get(i2).getEnName();
+ }
+ }
+ }
+ //修改引用数据
+ //查看是否主表
+ MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
+ mdmModuleDbEntity.setMdmId(mdmModuleDbFiledsRuleEntities.get(i1).getMdmId());
+ mdmModuleDbEntity.setSts("Y");
+ List mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
+ //设置主表
+ String mainDBTable = "";
+ String dataDBTable = "";
+ if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0){
+ for (int i2 = 0; i2 < mdmModuleDbEntities.size(); i2++) {
+ //主表
+ if("1".equals(mdmModuleDbEntities.get(i2).getDbType())){
+ mainDBTable = mdmModuleDbEntities.get(i2).getDbName();
+ }
+ if(mdmModuleDbFiledsRuleEntities.get(i1).getDbId().equals(mdmModuleDbEntities.get(i2).getId())){
+ dataDBTable = mdmModuleDbEntities.get(i2).getDbName();
+ }
+ }
+ }
+
+ if(mainDBTable.equals(dataDBTable)){//主表上的字段
+ Map updateMaps = new HashMap<>();
+ updateMaps.put("tableName",dataDBTable);
+ updateMaps.put("upFiled",upFiled);
+ updateMaps.put("oldData",oldData);
+ updateMaps.put("newData",newData);
+ updateMaps.put("modify_user_id",StpUtil.getLoginIdAsString());
+ mdmModuleDao.updataTreeUpData(updateMaps);
+ }else {//明细表上的字段
+
+
+
+ }
+
+ }
+ }
+ }
+
+ }
+ }
int a = mdmModuleDao.updateForm(mdmDataDto);
} else {
@@ -2762,6 +2860,7 @@ public class MdmServiceImpl implements IMdmService {
mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos);
if (jsonObject.getString("id") != null) {
mdmDataDto.setId(jsonObject.getString("id"));
+
int a = mdmModuleDao.updateForm(mdmDataDto);
} else {
mdmDataDto.setDbType(mdmModuleDbEntityList.get(i).getDbType());
From 99897ddbb295f5bfef4d6b013dd045fe6c460bd0 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Thu, 1 Aug 2024 08:51:10 +0800
Subject: [PATCH 10/26] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BB=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84=E4=B8=8A=E7=BA=A7?=
=?UTF-8?q?=E5=85=B3=E8=81=94=EF=BC=8C=E5=BC=95=E7=94=A8=E8=A1=A8=E5=8F=AA?=
=?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=B8=8A=E7=BA=A7i?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
index 36c5ee81..5bf7b6b9 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
@@ -473,7 +473,6 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
//查询主数据
MdmModuleEntity queryMdmModuleEntity = new MdmModuleEntity();
queryMdmModuleEntity.setSts("Y");
- queryMdmModuleEntity.setMdmCode(10021L);
List mdmModuleEntities = mdmModuleDao.queryBase(queryMdmModuleEntity);
if(mdmModuleEntities == null || mdmModuleEntities.size() == 0){
return BaseResult.getSuccessMessageEntity("主数据未设置,不需要下发");
From c5a55a82cae2f53b935a2b8dfa685f704e69b02c Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Fri, 2 Aug 2024 09:31:17 +0800
Subject: [PATCH 11/26] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BB=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84=E4=B8=8A=E7=BA=A7?=
=?UTF-8?q?=E5=85=B3=E8=81=94=EF=BC=8C=E5=BC=95=E7=94=A8=E8=A1=A8=E5=8F=AA?=
=?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=B8=8A=E7=BA=A7i?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mdm/mdmModule/dao/IMdmModuleDao.java | 2 +
.../mdmModule/dao/impl/MdmModuleDaoImpl.java | 7 +-
.../mdm/mdmModule/entity/MdmModuleEntity.xml | 25 +-
.../hzya/frame/mdm/service/IMdmService.java | 16 +-
.../mdm/service/impl/MdmServiceImpl.java | 220 ++++++++++--------
5 files changed, 173 insertions(+), 97 deletions(-)
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java
index 9d683008..1940d472 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java
@@ -66,5 +66,7 @@ public interface IMdmModuleDao extends IBaseDao {
List queryMdMFields(Map maps);
void updataTreeUpData(Map updateMaps);
+
+ void updataTreeUpDataDetail(Map updateMaps);
}
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java
index 750b0824..c9d4ea70 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java
@@ -162,7 +162,7 @@ public class MdmModuleDaoImpl extends MybatisGenericDao
}
@Override
public List queryMdmSTs(Map maps) {
- List o = (List) super.selectList(getSqlIdPrifx() + "queryMdmSTs", maps);
+ List o = (List) super.selectList(getSqlIdPrifx() + "queryMdmST", maps);
return o;
}
@@ -176,6 +176,11 @@ public class MdmModuleDaoImpl extends MybatisGenericDao
super.update(getSqlIdPrifx() + "updataTreeUpData", maps);
}
+ @Override
+ public void updataTreeUpDataDetail(Map maps) {
+ super.update(getSqlIdPrifx() + "updataTreeUpDataDetail", maps);
+ }
+
@Override
public List queryMdMFields(Map maps) {
List o = (List) super.selectList(getSqlIdPrifx() + "queryMdMFields", maps);
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
index e7ea39a9..4c3d4b73 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
@@ -936,7 +936,7 @@ where id = #{id}
WHERE table_name = #{tableName}
-
+
select
@@ -1056,5 +1056,28 @@ where id = #{id}
AND sts = 'Y'
AND data_status != 'N'
+
+
+
+ UPDATE ${tableName} a
+ JOIN ${mainDBTable} b ON a.formmain_id = b.id and b.sts = 'Y'
+ SET
+ a.${upFiled}=CONCAT(#{newData},SUBSTRING_INDEX(${upFiled},#{oldData},-1)),
+ a.modify_time = now(),
+ a.modify_user_id = '1',
+ a.data_status = 'F',
+
+ b.update_status = '0' ,
+ b.data_status = 'F',
+ b.modify_time = now(),
+ b.modify_user_id = '1'
+
+ WHERE
+ a.${upFiled} LIKE concat( #{oldData}, '%' )
+ AND a.sts = 'Y'
+ AND a.data_status != 'N'
+ AND b.sts = 'Y'
+ AND b.data_status != 'N'
+
diff --git a/service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java b/service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java
index 3d7d1216..fff31302 100644
--- a/service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java
+++ b/service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java
@@ -1,8 +1,11 @@
package com.hzya.frame.mdm.service;
import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.mdm.entity.MdmDataFiledDto;
import com.hzya.frame.web.entity.JsonResultEntity;
+import java.util.List;
+
/**
* 主数据服务接口
*/
@@ -118,6 +121,15 @@ public interface IMdmService {
* @Date 9:40 上午 2023/10/18
**/
JsonResultEntity doMdmDistribute(JSONObject jsonObject) throws Exception;
-
-
+ /**
+ * @Author lvleigang
+ * @Description 修改树结构的下级以及其他使用地方数据
+ * @Date 9:12 上午 2024/8/2
+ * @param mdmId 主数据mdmId
+ * @param tableName 主数据的表名
+ * @param id 数据id
+ * @param mdmDataFiledDtos 数据
+ * @return void
+ **/
+ void updateTreeUseData(String mdmId, String tableName, String id, List mdmDataFiledDtos);
}
diff --git a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
index d3a6b263..2b6c9005 100644
--- a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
@@ -2611,104 +2611,12 @@ public class MdmServiceImpl implements IMdmService {
if (flag) {
mdmDataDto.setId(jsonObject.getString("id"));
id = jsonObject.getString("id");
- boolean asdasd = false;
- if(asdasd){
- //查询是否设置的树形
- MdmModuleViewEntity mdmModuleViewEntity = new MdmModuleViewEntity();
- mdmModuleViewEntity.setMdmId(mdmModuleEntity.getId());
- mdmModuleViewEntity.setViewName("1");
- mdmModuleViewEntity.setSts("Y");
- List moduleViewEntityList = mdmModuleViewDao.queryBase(mdmModuleViewEntity);
- if (moduleViewEntityList != null && moduleViewEntityList.size() == 1) {
- mdmModuleViewEntity = moduleViewEntityList.get(0);
- //查询数据
- Map queryData = new HashMap<>();
- queryData.put("tableName", mdmDataDto.getTableName());//表名
- queryData.put("detailFlag", false);//是否明细
- queryData.put("id", id);//字段
- HashMap datas = mdmModuleDbDao.getServiceDataById(queryData);
- convertKeysToLowerCase(datas);
- //对比值是否有修改
- boolean upFlag = false;
- String oldData = "";
- String newData = "";
- for (int i1 = 0; i1 < mdmDataFiledDtos.size(); i1++) {
- if (mdmDataFiledDtos.get(i1).getFiledsName().equals(mdmModuleViewEntity.getUpIdFiled())) {
- newData = mdmDataFiledDtos.get(i1).getFiledsValue();
- oldData = datas.get(mdmDataFiledDtos.get(i1).getFiledsName()).toString();
-
- if (mdmDataFiledDtos.get(i1).getFiledsValue().equals(datas.get(mdmDataFiledDtos.get(i1).getFiledsName()).toString())) {
- upFlag = true;
- break;
- }
- }
- }
- if (upFlag) {
- //查询引用地方
- Map maps = new HashMap<>();
- maps.put("service",mdmDataDto.getTableName());
- maps.put("upId",mdmModuleViewEntity.getUpIdFiled());
- //maps.put("mdmId",mdmModuleEntity.getId());
- List mdmModuleDbFiledsRuleEntities = mdmModuleDbFiledsRuleDao.queryServiceQuote(maps);
- if(mdmModuleDbFiledsRuleEntities != null && mdmModuleDbFiledsRuleEntities.size() > 0){
- for (int i1 = 0; i1 < mdmModuleDbFiledsRuleEntities.size(); i1++) {
- //查询字段
- String upFiled = "";
-
- MdmModuleDbFiledsEntity moduleDbFiledsEntity = new MdmModuleDbFiledsEntity();
- moduleDbFiledsEntity.setMdmId(mdmModuleDbFiledsRuleEntities.get(i1).getMdmId());
- moduleDbFiledsEntity.setSts("Y");
- List mdmModuleDbFiledsEntities = mdmServiceCache.queryMdmModuleDbFileds(moduleDbFiledsEntity);
- if(mdmModuleDbFiledsEntities != null && mdmModuleDbFiledsEntities.size() > 0){
- for (int i2 = 0; i2 < mdmModuleDbFiledsEntities.size(); i2++) {
- if(mdmModuleDbFiledsRuleEntities.get(i1).getFiledId().equals(mdmModuleDbFiledsEntities.get(i2).getId())){
- upFiled = mdmModuleDbFiledsEntities.get(i2).getEnName();
- }
- }
- }
- //修改引用数据
- //查看是否主表
- MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
- mdmModuleDbEntity.setMdmId(mdmModuleDbFiledsRuleEntities.get(i1).getMdmId());
- mdmModuleDbEntity.setSts("Y");
- List mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
- //设置主表
- String mainDBTable = "";
- String dataDBTable = "";
- if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0){
- for (int i2 = 0; i2 < mdmModuleDbEntities.size(); i2++) {
- //主表
- if("1".equals(mdmModuleDbEntities.get(i2).getDbType())){
- mainDBTable = mdmModuleDbEntities.get(i2).getDbName();
- }
- if(mdmModuleDbFiledsRuleEntities.get(i1).getDbId().equals(mdmModuleDbEntities.get(i2).getId())){
- dataDBTable = mdmModuleDbEntities.get(i2).getDbName();
- }
- }
- }
-
- if(mainDBTable.equals(dataDBTable)){//主表上的字段
- Map updateMaps = new HashMap<>();
- updateMaps.put("tableName",dataDBTable);
- updateMaps.put("upFiled",upFiled);
- updateMaps.put("oldData",oldData);
- updateMaps.put("newData",newData);
- updateMaps.put("modify_user_id",StpUtil.getLoginIdAsString());
- mdmModuleDao.updataTreeUpData(updateMaps);
- }else {//明细表上的字段
+ updateTreeUseData(mdmModuleEntity.getId(),mdmDataDto.getTableName(),id,mdmDataFiledDtos);
- }
-
- }
- }
- }
-
- }
- }
int a = mdmModuleDao.updateForm(mdmDataDto);
} else {
@@ -2875,6 +2783,132 @@ public class MdmServiceImpl implements IMdmService {
return str.toString();
}
+ /**
+ * @Author lvleigang
+ * @Description 修改树结构的下级以及其他使用地方数据
+ * @Date 9:12 上午 2024/8/2
+ * @param mdmId 主数据mdmId
+ * @param tableName 主数据的表名
+ * @param id 数据id
+ * @param mdmDataFiledDtos 数据
+ * @return void
+ **/
+ public void updateTreeUseData(String mdmId, String tableName, String id, List mdmDataFiledDtos) {
+ //查询是否设置的树形
+ MdmModuleViewEntity mdmModuleViewEntity = new MdmModuleViewEntity();
+ mdmModuleViewEntity.setMdmId(mdmId);
+ mdmModuleViewEntity.setViewName("1");
+ mdmModuleViewEntity.setSts("Y");
+ List moduleViewEntityList = mdmModuleViewDao.queryBase(mdmModuleViewEntity);
+ if (moduleViewEntityList != null && moduleViewEntityList.size() == 1) {
+ mdmModuleViewEntity = moduleViewEntityList.get(0);
+ //查询数据
+ Map queryData = new HashMap<>();
+ queryData.put("tableName", tableName);//表名
+ queryData.put("detailFlag", false);//是否明细
+ queryData.put("id", id);//字段
+ HashMap datas = mdmModuleDbDao.getServiceDataById(queryData);
+ convertKeysToLowerCase(datas);
+ //对比值是否有修改
+ boolean upFlag = false;
+ String oldData = "";
+
+ String newData = "";
+
+ for (int i1 = 0; i1 < mdmDataFiledDtos.size(); i1++) {
+ if (mdmDataFiledDtos.get(i1).getFiledsName().equals(mdmModuleViewEntity.getUpIdFiled())) {
+ newData = mdmDataFiledDtos.get(i1).getFiledsValue();
+ oldData = datas.get(mdmDataFiledDtos.get(i1).getFiledsName()).toString();
+
+ if (mdmDataFiledDtos.get(i1).getFiledsValue().equals(datas.get(mdmDataFiledDtos.get(i1).getFiledsName()).toString())) {
+ upFlag = true;
+ break;
+ }
+ }
+ }
+
+ if (!"".equals(oldData)) {
+ oldData = oldData + "," + id;
+ } else {
+ oldData = id;
+ }
+ if (!"".equals(newData)) {
+ newData = newData + "," + id;
+ } else {
+ newData = id;
+ }
+ if (!upFlag) {
+ //查询引用地方
+ Map maps = new HashMap<>();
+ maps.put("service", tableName);
+ maps.put("upId", mdmModuleViewEntity.getUpIdFiled());
+ //maps.put("mdmId",mdmModuleEntity.getId());
+ List mdmModuleDbFiledsRuleEntities = mdmModuleDbFiledsRuleDao.queryServiceQuote(maps);
+ if (mdmModuleDbFiledsRuleEntities != null && mdmModuleDbFiledsRuleEntities.size() > 0) {
+ for (int i1 = 0; i1 < mdmModuleDbFiledsRuleEntities.size(); i1++) {
+ //查询字段
+ String upFiled = "";
+
+ MdmModuleDbFiledsEntity moduleDbFiledsEntity = new MdmModuleDbFiledsEntity();
+ moduleDbFiledsEntity.setMdmId(mdmModuleDbFiledsRuleEntities.get(i1).getMdmId());
+ moduleDbFiledsEntity.setSts("Y");
+ List mdmModuleDbFiledsEntities = mdmServiceCache.queryMdmModuleDbFileds(moduleDbFiledsEntity);
+ if (mdmModuleDbFiledsEntities != null && mdmModuleDbFiledsEntities.size() > 0) {
+ for (int i2 = 0; i2 < mdmModuleDbFiledsEntities.size(); i2++) {
+ if (mdmModuleDbFiledsRuleEntities.get(i1).getFiledId().equals(mdmModuleDbFiledsEntities.get(i2).getId())) {
+ upFiled = mdmModuleDbFiledsEntities.get(i2).getEnName();
+ }
+ }
+ }
+ //修改引用数据
+ //查看是否主表
+ MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
+ mdmModuleDbEntity.setMdmId(mdmModuleDbFiledsRuleEntities.get(i1).getMdmId());
+ mdmModuleDbEntity.setSts("Y");
+ List mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
+ //设置主表
+ String mainDBTable = "";
+ String dataDBTable = "";
+ if (mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0) {
+ for (int i2 = 0; i2 < mdmModuleDbEntities.size(); i2++) {
+ //主表
+ if ("1".equals(mdmModuleDbEntities.get(i2).getDbType())) {
+ mainDBTable = mdmModuleDbEntities.get(i2).getDbName();
+ }
+ if (mdmModuleDbFiledsRuleEntities.get(i1).getDbId().equals(mdmModuleDbEntities.get(i2).getId())) {
+ dataDBTable = mdmModuleDbEntities.get(i2).getDbName();
+ }
+ }
+ }
+
+ if (mainDBTable.equals(dataDBTable)) {//主表上的字段
+ Map updateMaps = new HashMap<>();
+ updateMaps.put("tableName", dataDBTable);
+ updateMaps.put("upFiled", upFiled);
+ updateMaps.put("oldData", oldData);
+ updateMaps.put("newData", newData);
+ updateMaps.put("modify_user_id", StpUtil.getLoginIdAsString());
+ mdmModuleDao.updataTreeUpData(updateMaps);
+ } else {//明细表上的字段
+ Map updateMaps = new HashMap<>();
+ updateMaps.put("mainDBTable", mainDBTable);
+ updateMaps.put("tableName", dataDBTable);
+ updateMaps.put("upFiled", upFiled);
+ updateMaps.put("oldData", oldData);
+ updateMaps.put("newData", newData);
+ updateMaps.put("modify_user_id", StpUtil.getLoginIdAsString());
+ mdmModuleDao.updataTreeUpDataDetail(updateMaps);
+
+
+ }
+
+ }
+ }
+ }
+
+ }
+ }
+
/**
* @param jsonObject
From ee1195cbfa2990c2eca6fc20d7e6f1eafb53ab52 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Mon, 5 Aug 2024 15:50:11 +0800
Subject: [PATCH 12/26] =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E8=87=AA?=
=?UTF-8?q?=E5=8A=A8=E4=B8=8B=E5=8F=91=EF=BC=8C=E6=9F=A5=E8=AF=A2=E4=B8=89?=
=?UTF-8?q?=E6=96=B9=E4=B8=BB=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../plugin/MdmModulePluginInitializer.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
index 5bf7b6b9..3d974a2a 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
@@ -1008,6 +1008,18 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
parameterJson.put("body",apiEntity.getBodyIn());
parameterJson.put("query",apiEntity.getQueryIn());
parameterJson.put("data",doObjects.get(i));
+ //1、根据主数据id、数据id、应用ID默认查询主数据应用下发三方id表,只查询最新的一条数据
+ MdmModuleDistributeTripartiteEntity mdmModuleDistributeTripartiteEntity1 = new MdmModuleDistributeTripartiteEntity();
+ mdmModuleDistributeTripartiteEntity1.setSts("Y");
+ mdmModuleDistributeTripartiteEntity1.setMdmId(mdmId);
+ mdmModuleDistributeTripartiteEntity1.setDataId(objects.get(i).getString("id"));
+ mdmModuleDistributeTripartiteEntity1.setAppId(sysApplicationEntity.getId());
+ mdmModuleDistributeTripartiteEntity1 = mdmModuleDistributeTripartiteDao.queryOneTripartite(mdmModuleDistributeTripartiteEntity1);
+ String tripartiteId = "";
+ if(mdmModuleDistributeTripartiteEntity1 != null && mdmModuleDistributeTripartiteEntity1.getTripartiteId() != null ){
+ tripartiteId = mdmModuleDistributeTripartiteEntity1.getTripartiteId();
+ }
+ parameterJson.put("tripartiteId", tripartiteId);
/** head */
Map header = null;
/** query */
From 9d2875e3ba403f6b81de8ad0ec8e562f4157547a Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Wed, 7 Aug 2024 09:13:09 +0800
Subject: [PATCH 13/26] =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=B8=8B?=
=?UTF-8?q?=E5=8F=91=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/hzya/frame/mdm/service/impl/MdmServiceImpl.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
index 2b6c9005..26c03807 100644
--- a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
@@ -1884,7 +1884,7 @@ public class MdmServiceImpl implements IMdmService {
JsonResultEntity rzjsonResultEntity = sendData(loginApi, rzheaders, rzbodys, rzquerys);
if (!rzjsonResultEntity.isFlag()) {
saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(), mdmModuleDistributeEntity.getId(), "2", "转发失败,认证接口调用失败", dbname, object.getString("id"), sysApplicationEntity.getName(), sysApplicationEntity.getId(), apiEntity.getApiName(), apiEntity.getId(), object.toJSONString(), type);
- return BaseResult.getFailureMessageEntity("发送错误:" + rzjsonResultEntity.getMsg());
+ return BaseResult.getFailureMessageEntity("发送错误:转发失败,认证接口调用失败");
}
JSONObject attritube = JSONObject.parseObject(rzjsonResultEntity.getAttribute().toString());
//logger.info("认证接口返回信息:"+ attritube.toJSONString());
@@ -1936,7 +1936,7 @@ public class MdmServiceImpl implements IMdmService {
} catch (Exception e) {
logger.error("新增返回脚本解析保存三方id错误" + jsonResultEntity.getAttribute());
saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(), mdmModuleDistributeEntity.getId(), "2", "转发失败", dbname, object.getString("id"), sysApplicationEntity.getName(), sysApplicationEntity.getId(), apiEntity.getApiName(), apiEntity.getId(), object.toJSONString(), type);
- return BaseResult.getFailureMessageEntity("发送错误:" + jsonResultEntity.getMsg());
+ return BaseResult.getFailureMessageEntity("发送错误:新增返回脚本解析保存三方id错误");
}
}
}
@@ -1944,7 +1944,7 @@ public class MdmServiceImpl implements IMdmService {
return BaseResult.getSuccessMessageEntity("发送成功");
} else {
saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(), mdmModuleDistributeEntity.getId(), "2", "转发失败", dbname, object.getString("id"), sysApplicationEntity.getName(), sysApplicationEntity.getId(), apiEntity.getApiName(), apiEntity.getId(), object.toJSONString(), type);
- return BaseResult.getFailureMessageEntity("发送错误:" + jsonResultEntity.getMsg());
+ return BaseResult.getFailureMessageEntity("发送错误:" + jsonResultEntity.getAttribute());
}
}
From 3b897cf172511b61d2332c2defe2e91fa5f21dea Mon Sep 17 00:00:00 2001
From: hecan <1718492867@qq.com>
Date: Thu, 8 Aug 2024 10:17:49 +0800
Subject: [PATCH 14/26] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E4=B8=AD=E6=A0=B9=E6=8D=AEdata=5Fid=E5=88=A4=E6=96=AD=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E6=98=AF=E5=90=A6=E5=B7=B2=E7=BB=8F=E4=BF=9D=E5=AD=98?=
=?UTF-8?q?=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/ComparisonServiceImpl.java | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
index 9defee72..de8412fa 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
@@ -211,6 +211,19 @@ public class ComparisonServiceImpl extends BaseService
if (comparisonEntities != null && comparisonEntities.size() > 0) {
map = spliceMainMap(comparisonEntities, jsonObjectMain, map, comparisonEntity, comparisonDetailsEntity);
+ //根据data_id判断数据是否已经保存在相关表中,避免重复保存
+ List fields = getFields(comparisonEntity);
+ Map mapDataId=new HashMap<>();
+ mapDataId.put("data_id",jsonObjectMain.getString("data_id"));
+ ComparisonEntity comparisonDataId=new ComparisonEntity();
+ comparisonDataId.setMap(mapDataId);
+ comparisonDataId.setDbName(comparisonEntity.getDbName());
+ comparisonDataId.setFields(fields);
+ List
-
- select
-
- from ${tableName}
-
- and id like concat('%',#{id},'%')
+
+ select
+
+ from ${tableName}
+
+ and id like concat('%',#{id},'%')
and formmain_id like concat('%',#{formmainId},'%')
and target_app like concat('%',#{targetApp},'%')
and target_api like concat('%',#{targetApi},'%')
@@ -137,10 +137,11 @@
and org_id like concat('%',#{org_id},'%')
and company_id like concat('%',#{companyId},'%')
and sts='Y'
-
- order by sorts desc
- order by ${sort} ${order}
-
+
+
+
+ order by create_time desc
+
From f5a9fe70770b15b8ffb2ef68fa5fb57eb0bb7d32 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Thu, 8 Aug 2024 17:53:03 +0800
Subject: [PATCH 17/26] =?UTF-8?q?GrpU8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../acctVouchInfo/dao/IAcctVouchInfoDao.java | 19 ++
.../dao/impl/AcctVouchInfoDaoImpl.java | 29 ++
.../entity/AcctVouchInfoEntity.java | 194 ++++++++++++
.../entity/AcctVouchInfoEntity.xml | 198 ++++++++++++
.../entity/AcctVouchInfoEntityVo.java | 194 ++++++++++++
.../service/IAcctVouchInfoService.java | 22 ++
.../impl/AcctVouchInfoServiceImpl.java | 61 ++++
.../dictAcctSubj/dao/IDictAcctSubjDao.java | 19 ++
.../dao/impl/DictAcctSubjDaoImpl.java | 29 ++
.../entity/DictAcctSubjEntity.java | 284 ++++++++++++++++++
.../entity/DictAcctSubjEntity.xml | 270 +++++++++++++++++
.../entity/DictAcctSubjEntityVo.java | 284 ++++++++++++++++++
.../service/IDictAcctSubjService.java | 22 ++
.../service/impl/DictAcctSubjServiceImpl.java | 61 ++++
.../dictCheckType/dao/IDictCheckTypeDao.java | 19 ++
.../dao/impl/DictCheckTypeDaoImpl.java | 28 ++
.../entity/DictCheckTypeEntity.java | 74 +++++
.../entity/DictCheckTypeEntity.xml | 103 +++++++
.../entity/DictCheckTypeEntityVo.java | 74 +++++
.../service/IDictCheckTypeService.java | 22 ++
.../impl/DictCheckTypeServiceImpl.java | 61 ++++
21 files changed, 2067 insertions(+)
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/IAcctVouchInfoDao.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntityVo.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/impl/AcctVouchInfoServiceImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/IDictAcctSubjDao.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/impl/DictAcctSubjDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntityVo.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/IDictAcctSubjService.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/impl/DictAcctSubjServiceImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/IDictCheckTypeDao.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntityVo.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/IDictCheckTypeService.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/impl/DictCheckTypeServiceImpl.java
diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/IAcctVouchInfoDao.java b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/IAcctVouchInfoDao.java
new file mode 100644
index 00000000..f1fd76b2
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/IAcctVouchInfoDao.java
@@ -0,0 +1,19 @@
+package com.hzya.frame.grpU8.acctVouchInfo.dao;
+
+import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity;
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntityVo;
+
+import java.util.List;
+
+/**
+ * 子表(acct_vouch_info: table)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-07-09 11:25:15
+ */
+public interface IAcctVouchInfoDao extends IBaseDao {
+
+ List queryData(AcctVouchInfoEntity entity);
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java
new file mode 100644
index 00000000..38e0cd95
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java
@@ -0,0 +1,29 @@
+package com.hzya.frame.grpU8.acctVouchInfo.dao.impl;
+
+import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity;
+import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity;
+import com.hzya.frame.grpU8.acctVouchInfo.dao.IAcctVouchInfoDao;
+import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntityVo;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+
+import java.util.List;
+
+/**
+ * 子表(AcctVouchInfo)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-07-09 11:25:15
+ */
+@Repository(value = "AcctVouchInfoDaoImpl")
+public class AcctVouchInfoDaoImpl extends MybatisGenericDao implements IAcctVouchInfoDao {
+
+ @Override
+ public List queryData(AcctVouchInfoEntity entity) {
+ List o = (List) super.selectList(getSqlIdPrifx() + "queryData", entity);
+ return o;
+ }
+
+
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.java b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.java
new file mode 100644
index 00000000..8af372bb
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.java
@@ -0,0 +1,194 @@
+package com.hzya.frame.grpU8.acctVouchInfo.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 子表(AcctVouchInfo)实体类
+ *
+ * @author makejava
+ * @since 2024-07-09 11:25:15
+ */
+public class AcctVouchInfoEntity extends BaseEntity {
+
+ /** 年度 */
+ private String acct_year;
+ /** 月份 */
+ private String acct_month;
+ /** 科室编码 */
+ private String dept_code;
+ /** 科室名称 */
+ private String dept_name;
+ /** 会计科目编码 */
+ private String acct_subj_code;
+ /** 会计科目名称 */
+ private String acct_subj_name;
+ /** 辅助核算项编码 */
+ private String check_type_code;
+ /** 辅助核算项名称 */
+ private String check_type_name;
+ /** 借贷方向 */
+ private String direction;
+ /** 金额 */
+ private Double amount;
+ /** 资金来源编码 */
+ private String fund_source_code;
+ /** 凭证号 */
+ private String vouch_no;
+ /** 摘要 */
+ private String summary;
+ /** 记账人 */
+ private String bookkeeper;
+ /** 单位编码 */
+ private String org_code;
+ /** 单位名称 */
+ private String org_name;
+ /** 院区编码 */
+ private String branch_code;
+ /** 院区名称 */
+ private String branch_name;
+
+ public String getAcct_year() {
+ return acct_year;
+ }
+
+ public void setAcct_year(String acct_year) {
+ this.acct_year = acct_year;
+ }
+
+ public String getAcct_month() {
+ return acct_month;
+ }
+
+ public void setAcct_month(String acct_month) {
+ this.acct_month = acct_month;
+ }
+
+ public String getDept_code() {
+ return dept_code;
+ }
+
+ public void setDept_code(String dept_code) {
+ this.dept_code = dept_code;
+ }
+
+ public String getDept_name() {
+ return dept_name;
+ }
+
+ public void setDept_name(String dept_name) {
+ this.dept_name = dept_name;
+ }
+
+ public String getAcct_subj_code() {
+ return acct_subj_code;
+ }
+
+ public void setAcct_subj_code(String acct_subj_code) {
+ this.acct_subj_code = acct_subj_code;
+ }
+
+ public String getAcct_subj_name() {
+ return acct_subj_name;
+ }
+
+ public void setAcct_subj_name(String acct_subj_name) {
+ this.acct_subj_name = acct_subj_name;
+ }
+
+ public String getCheck_type_code() {
+ return check_type_code;
+ }
+
+ public void setCheck_type_code(String check_type_code) {
+ this.check_type_code = check_type_code;
+ }
+
+ public String getCheck_type_name() {
+ return check_type_name;
+ }
+
+ public void setCheck_type_name(String check_type_name) {
+ this.check_type_name = check_type_name;
+ }
+
+ public String getDirection() {
+ return direction;
+ }
+
+ public void setDirection(String direction) {
+ this.direction = direction;
+ }
+
+ public Double getAmount() {
+ return amount;
+ }
+
+ public void setAmount(Double amount) {
+ this.amount = amount;
+ }
+
+ public String getFund_source_code() {
+ return fund_source_code;
+ }
+
+ public void setFund_source_code(String fund_source_code) {
+ this.fund_source_code = fund_source_code;
+ }
+
+ public String getVouch_no() {
+ return vouch_no;
+ }
+
+ public void setVouch_no(String vouch_no) {
+ this.vouch_no = vouch_no;
+ }
+
+ public String getSummary() {
+ return summary;
+ }
+
+ public void setSummary(String summary) {
+ this.summary = summary;
+ }
+
+ public String getBookkeeper() {
+ return bookkeeper;
+ }
+
+ public void setBookkeeper(String bookkeeper) {
+ this.bookkeeper = bookkeeper;
+ }
+
+ public String getOrg_code() {
+ return org_code;
+ }
+
+ public void setOrg_code(String org_code) {
+ this.org_code = org_code;
+ }
+
+ public String getOrg_name() {
+ return org_name;
+ }
+
+ public void setOrg_name(String org_name) {
+ this.org_name = org_name;
+ }
+
+ public String getBranch_code() {
+ return branch_code;
+ }
+
+ public void setBranch_code(String branch_code) {
+ this.branch_code = branch_code;
+ }
+
+ public String getBranch_name() {
+ return branch_name;
+ }
+
+ public void setBranch_name(String branch_name) {
+ this.branch_name = branch_name;
+ }
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.xml
new file mode 100644
index 00000000..6438611b
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.xml
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ acct_year
+ ,acct_month
+ ,dept_code
+ ,dept_name
+ ,acct_subj_code
+ ,acct_subj_name
+ ,check_type_code
+ ,check_type_name
+ ,direction
+ ,amount
+ ,fund_source_code
+ ,vouch_no
+ ,summary
+ ,bookkeeper
+ ,org_code
+ ,org_name
+ ,branch_code
+ ,branch_name
+
+
+
+ select
+
+ from acct_vouch_info
+
+ and acct_year = #{acct_year}
+ and acct_month = #{acct_month}
+ and dept_code = #{dept_code}
+ and dept_name = #{dept_name}
+ and acct_subj_code = #{acct_subj_code}
+ and acct_subj_name = #{acct_subj_name}
+ and check_type_code = #{check_type_code}
+ and check_type_name = #{check_type_name}
+ and direction = #{direction}
+ and amount = #{amount}
+ and fund_source_code = #{fund_source_code}
+ and vouch_no = #{vouch_no}
+ and summary = #{summary}
+ and bookkeeper = #{bookkeeper}
+ and org_code = #{org_code}
+ and org_name = #{org_name}
+ and branch_code = #{branch_code}
+ and branch_name = #{branch_name}
+
+
+
+
+
+ select count(1) from acct_vouch_info
+
+ and acct_year = #{acct_year}
+ and acct_month = #{acct_month}
+ and dept_code = #{dept_code}
+ and dept_name = #{dept_name}
+ and acct_subj_code = #{acct_subj_code}
+ and acct_subj_name = #{acct_subj_name}
+ and check_type_code = #{check_type_code}
+ and check_type_name = #{check_type_name}
+ and direction = #{direction}
+ and amount = #{amount}
+ and fund_source_code = #{fund_source_code}
+ and vouch_no = #{vouch_no}
+ and summary = #{summary}
+ and bookkeeper = #{bookkeeper}
+ and org_code = #{org_code}
+ and org_name = #{org_name}
+ and branch_code = #{branch_code}
+ and branch_name = #{branch_name}
+
+
+
+
+
+ select
+
+ from acct_vouch_info
+
+ and acct_year like concat('%',#{acct_year},'%')
+ and acct_month like concat('%',#{acct_month},'%')
+ and dept_code like concat('%',#{dept_code},'%')
+ and dept_name like concat('%',#{dept_name},'%')
+ and acct_subj_code like concat('%',#{acct_subj_code},'%')
+ and acct_subj_name like concat('%',#{acct_subj_name},'%')
+ and check_type_code like concat('%',#{check_type_code},'%')
+ and check_type_name like concat('%',#{check_type_name},'%')
+ and direction like concat('%',#{direction},'%')
+ and amount like concat('%',#{amount},'%')
+ and fund_source_code like concat('%',#{fund_source_code},'%')
+ and vouch_no like concat('%',#{vouch_no},'%')
+ and summary like concat('%',#{summary},'%')
+ and bookkeeper like concat('%',#{bookkeeper},'%')
+ and org_code like concat('%',#{org_code},'%')
+ and org_name like concat('%',#{org_name},'%')
+ and branch_code like concat('%',#{branch_code},'%')
+ and branch_name like concat('%',#{branch_name},'%')
+
+
+
+
+
+ select
+
+ from acct_vouch_info
+
+ or acct_year = #{acct_year}
+ or acct_month = #{acct_month}
+ or dept_code = #{dept_code}
+ or dept_name = #{dept_name}
+ or acct_subj_code = #{acct_subj_code}
+ or acct_subj_name = #{acct_subj_name}
+ or check_type_code = #{check_type_code}
+ or check_type_name = #{check_type_name}
+ or direction = #{direction}
+ or amount = #{amount}
+ or fund_source_code = #{fund_source_code}
+ or vouch_no = #{vouch_no}
+ or summary = #{summary}
+ or bookkeeper = #{bookkeeper}
+ or org_code = #{org_code}
+ or org_name = #{org_name}
+ or branch_code = #{branch_code}
+ or branch_name = #{branch_name}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select
+
+ from acct_vouch_info
+
+ and acct_year like '%${acct_year}%'
+ and acct_month like '%${acct_month}%'
+ and dept_code like '%${dept_code}%'
+ and dept_name like '%${dept_name}%'
+ and acct_subj_code like '%${acct_subj_code}%'
+ and acct_subj_name like '%${acct_subj_name}%'
+ and check_type_code like '%${check_type_code}%'
+ and check_type_name like '%${check_type_name}%'
+ and direction like '%${direction}%'
+ and amount like '%${amount}%'
+ and fund_source_code like '%${fund_source_code}%'
+ and vouch_no like '%${vouch_no}%'
+ and summary like '%${summary}%'
+ and bookkeeper like '%${bookkeeper}%'
+ and org_code like '%${org_code}%'
+ and org_name like '%${org_name}%'
+ and branch_code like '%${branch_code}%'
+ and branch_name like '%${branch_name}%'
+
+
+
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntityVo.java b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntityVo.java
new file mode 100644
index 00000000..5ef35f28
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntityVo.java
@@ -0,0 +1,194 @@
+package com.hzya.frame.grpU8.acctVouchInfo.entity;
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/**
+ * 子表(AcctVouchInfo)实体类
+ *
+ * @author makejava
+ * @since 2024-07-09 11:25:15
+ */
+public class AcctVouchInfoEntityVo {
+
+ /** 年度 */
+ private String acct_year;
+ /** 月份 */
+ private String acct_month;
+ /** 科室编码 */
+ private String dept_code;
+ /** 科室名称 */
+ private String dept_name;
+ /** 会计科目编码 */
+ private String acct_subj_code;
+ /** 会计科目名称 */
+ private String acct_subj_name;
+ /** 辅助核算项编码 */
+ private String check_type_code;
+ /** 辅助核算项名称 */
+ private String check_type_name;
+ /** 借贷方向 */
+ private String direction;
+ /** 金额 */
+ private Double amount;
+ /** 资金来源编码 */
+ private String fund_source_code;
+ /** 凭证号 */
+ private String vouch_no;
+ /** 摘要 */
+ private String summary;
+ /** 记账人 */
+ private String bookkeeper;
+ /** 单位编码 */
+ private String org_code;
+ /** 单位名称 */
+ private String org_name;
+ /** 院区编码 */
+ private String branch_code;
+ /** 院区名称 */
+ private String branch_name;
+
+ public String getAcct_year() {
+ return acct_year;
+ }
+
+ public void setAcct_year(String acct_year) {
+ this.acct_year = acct_year;
+ }
+
+ public String getAcct_month() {
+ return acct_month;
+ }
+
+ public void setAcct_month(String acct_month) {
+ this.acct_month = acct_month;
+ }
+
+ public String getDept_code() {
+ return dept_code;
+ }
+
+ public void setDept_code(String dept_code) {
+ this.dept_code = dept_code;
+ }
+
+ public String getDept_name() {
+ return dept_name;
+ }
+
+ public void setDept_name(String dept_name) {
+ this.dept_name = dept_name;
+ }
+
+ public String getAcct_subj_code() {
+ return acct_subj_code;
+ }
+
+ public void setAcct_subj_code(String acct_subj_code) {
+ this.acct_subj_code = acct_subj_code;
+ }
+
+ public String getAcct_subj_name() {
+ return acct_subj_name;
+ }
+
+ public void setAcct_subj_name(String acct_subj_name) {
+ this.acct_subj_name = acct_subj_name;
+ }
+
+ public String getCheck_type_code() {
+ return check_type_code;
+ }
+
+ public void setCheck_type_code(String check_type_code) {
+ this.check_type_code = check_type_code;
+ }
+
+ public String getCheck_type_name() {
+ return check_type_name;
+ }
+
+ public void setCheck_type_name(String check_type_name) {
+ this.check_type_name = check_type_name;
+ }
+
+ public String getDirection() {
+ return direction;
+ }
+
+ public void setDirection(String direction) {
+ this.direction = direction;
+ }
+
+ public Double getAmount() {
+ return amount;
+ }
+
+ public void setAmount(Double amount) {
+ this.amount = amount;
+ }
+
+ public String getFund_source_code() {
+ return fund_source_code;
+ }
+
+ public void setFund_source_code(String fund_source_code) {
+ this.fund_source_code = fund_source_code;
+ }
+
+ public String getVouch_no() {
+ return vouch_no;
+ }
+
+ public void setVouch_no(String vouch_no) {
+ this.vouch_no = vouch_no;
+ }
+
+ public String getSummary() {
+ return summary;
+ }
+
+ public void setSummary(String summary) {
+ this.summary = summary;
+ }
+
+ public String getBookkeeper() {
+ return bookkeeper;
+ }
+
+ public void setBookkeeper(String bookkeeper) {
+ this.bookkeeper = bookkeeper;
+ }
+
+ public String getOrg_code() {
+ return org_code;
+ }
+
+ public void setOrg_code(String org_code) {
+ this.org_code = org_code;
+ }
+
+ public String getOrg_name() {
+ return org_name;
+ }
+
+ public void setOrg_name(String org_name) {
+ this.org_name = org_name;
+ }
+
+ public String getBranch_code() {
+ return branch_code;
+ }
+
+ public void setBranch_code(String branch_code) {
+ this.branch_code = branch_code;
+ }
+
+ public String getBranch_name() {
+ return branch_name;
+ }
+
+ public void setBranch_name(String branch_name) {
+ this.branch_name = branch_name;
+ }
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java
new file mode 100644
index 00000000..22bd525c
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java
@@ -0,0 +1,22 @@
+package com.hzya.frame.grpU8.acctVouchInfo.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+/**
+ * 子表(AcctVouchInfo)表服务接口
+ *
+ * @author makejava
+ * @since 2024-07-09 11:25:15
+ */
+public interface IAcctVouchInfoService extends IBaseService{
+ /**
+ * @param jsonObject
+ * @return com.hzya.frame.web.entity.JsonResultEntity
+ * @Author lvleigang
+ * @Description 数据表
+ * @Date 11:52 上午 2024/3/27
+ **/
+ JsonResultEntity queryData(JSONObject jsonObject);
+}
diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/impl/AcctVouchInfoServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/impl/AcctVouchInfoServiceImpl.java
new file mode 100644
index 00000000..9f7a93c1
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/impl/AcctVouchInfoServiceImpl.java
@@ -0,0 +1,61 @@
+package com.hzya.frame.grpU8.acctVouchInfo.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hzya.frame.sysnew.user.entity.SysUserEntity;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity;
+import com.hzya.frame.grpU8.acctVouchInfo.dao.IAcctVouchInfoDao;
+import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntityVo;
+import com.hzya.frame.grpU8.acctVouchInfo.service.IAcctVouchInfoService;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import com.hzya.frame.basedao.service.impl.BaseService;
+
+import java.util.List;
+
+/**
+ * 子表(AcctVouchInfo)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-07-09 11:25:15
+ */
+@Service(value = "acctVouchInfoService")
+public class AcctVouchInfoServiceImpl extends BaseService implements IAcctVouchInfoService {
+
+ private IAcctVouchInfoDao acctVouchInfoDao;
+
+ @Autowired
+ public void setAcctVouchInfoDao(IAcctVouchInfoDao dao) {
+ this.acctVouchInfoDao = dao;
+ this.dao = dao;
+ }
+
+ /**
+ * @param jsonObject
+ * @return com.hzya.frame.web.entity.JsonResultEntity
+ * @Author lvleigang
+ * @Description 数据表
+ * @Date 11:52 上午 2024/3/27
+ **/
+ @Override
+ public JsonResultEntity queryData(JSONObject jsonObject) {
+ AcctVouchInfoEntity entity = getData("jsonStr", jsonObject, AcctVouchInfoEntity.class);
+ if(entity == null ){
+ entity = new AcctVouchInfoEntity();
+ }
+ //判断分页
+ if (entity.getPageNum() != null && entity.getPageSize() != null) {
+ PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
+ List list = acctVouchInfoDao.queryData(entity);
+ PageInfo pageInfo = new PageInfo(list);
+ return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
+ }else {
+ List list = acctVouchInfoDao.queryData(entity);
+ return BaseResult.getSuccessMessageEntity("查询数据成功", list);
+ }
+ }
+}
diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/IDictAcctSubjDao.java b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/IDictAcctSubjDao.java
new file mode 100644
index 00000000..44744c6f
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/IDictAcctSubjDao.java
@@ -0,0 +1,19 @@
+package com.hzya.frame.grpU8.dictAcctSubj.dao;
+
+import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntity;
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntityVo;
+
+import java.util.List;
+
+/**
+ * 子表(dict_acct_subj: table)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-07-09 11:23:36
+ */
+public interface IDictAcctSubjDao extends IBaseDao {
+
+ List queryData(DictAcctSubjEntity entity);
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/impl/DictAcctSubjDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/impl/DictAcctSubjDaoImpl.java
new file mode 100644
index 00000000..d29909f5
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/impl/DictAcctSubjDaoImpl.java
@@ -0,0 +1,29 @@
+package com.hzya.frame.grpU8.dictAcctSubj.dao.impl;
+
+import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity;
+import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntityVo;
+import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntity;
+import com.hzya.frame.grpU8.dictAcctSubj.dao.IDictAcctSubjDao;
+import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntityVo;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+
+import java.util.List;
+
+/**
+ * 子表(DictAcctSubj)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-07-09 11:23:36
+ */
+@Repository(value = "DictAcctSubjDaoImpl")
+public class DictAcctSubjDaoImpl extends MybatisGenericDao implements IDictAcctSubjDao{
+
+ @Override
+ public List queryData(DictAcctSubjEntity entity) {
+ List o = (List) super.selectList(getSqlIdPrifx() + "queryData", entity);
+ return o;
+ }
+
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntity.java b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntity.java
new file mode 100644
index 00000000..ca402cd7
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntity.java
@@ -0,0 +1,284 @@
+package com.hzya.frame.grpU8.dictAcctSubj.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 子表(DictAcctSubj)实体类
+ *
+ * @author makejava
+ * @since 2024-07-09 11:23:36
+ */
+public class DictAcctSubjEntity extends BaseEntity {
+
+ /** 年度 */
+ private String acct_year;
+ /** 会计科目编码 */
+ private String acct_subj_code;
+ /** 会计科目名称 */
+ private String acct_subj_name;
+ /** 上级编码 */
+ private String supper_code;
+ /** 科目级次 */
+ private String subj_level;
+ /** 是否末级 */
+ private String is_last;
+ /** 科目类型编码 */
+ private String subj_type_code;
+ /** 科目类型名称 */
+ private String subj_type_name;
+ /** 借贷方向 */
+ private String direction;
+ /** 是否现金 */
+ private String is_cash;
+ /** 科目性质 */
+ private String subj_nature_code;
+ /** 是否辅助核算 */
+ private String is_check;
+ /** 是否停用 */
+ private String is_stop;
+ /** 预算会计科目编码 */
+ private String budg_subj_code;
+ /** 预算会计科目名称 */
+ private String budg_subj_name;
+ /** 辅助核算项1 */
+ private String check_type_name1;
+ /** 辅助核算项2 */
+ private String check_type_name2;
+ /** 辅助核算项3 */
+ private String check_type_name3;
+ /** 辅助核算项4 */
+ private String check_type_name4;
+ /** 辅助核算项5 */
+ private String check_type_name5;
+ /** 辅助核算项6 */
+ private String check_type_name6;
+ /** 辅助核算项7 */
+ private String check_type_name7;
+ /** 辅助核算项8 */
+ private String check_type_name8;
+ /** 单位编码 */
+ private String org_code;
+ /** 单位名称 */
+ private String org_name;
+ /** 院区编码 */
+ private String branch_code;
+ /** 院区名称 */
+ private String branch_name;
+
+ public String getAcct_year() {
+ return acct_year;
+ }
+
+ public void setAcct_year(String acct_year) {
+ this.acct_year = acct_year;
+ }
+
+ public String getAcct_subj_code() {
+ return acct_subj_code;
+ }
+
+ public void setAcct_subj_code(String acct_subj_code) {
+ this.acct_subj_code = acct_subj_code;
+ }
+
+ public String getAcct_subj_name() {
+ return acct_subj_name;
+ }
+
+ public void setAcct_subj_name(String acct_subj_name) {
+ this.acct_subj_name = acct_subj_name;
+ }
+
+ public String getSupper_code() {
+ return supper_code;
+ }
+
+ public void setSupper_code(String supper_code) {
+ this.supper_code = supper_code;
+ }
+
+ public String getSubj_level() {
+ return subj_level;
+ }
+
+ public void setSubj_level(String subj_level) {
+ this.subj_level = subj_level;
+ }
+
+ public String getIs_last() {
+ return is_last;
+ }
+
+ public void setIs_last(String is_last) {
+ this.is_last = is_last;
+ }
+
+ public String getSubj_type_code() {
+ return subj_type_code;
+ }
+
+ public void setSubj_type_code(String subj_type_code) {
+ this.subj_type_code = subj_type_code;
+ }
+
+ public String getSubj_type_name() {
+ return subj_type_name;
+ }
+
+ public void setSubj_type_name(String subj_type_name) {
+ this.subj_type_name = subj_type_name;
+ }
+
+ public String getDirection() {
+ return direction;
+ }
+
+ public void setDirection(String direction) {
+ this.direction = direction;
+ }
+
+ public String getIs_cash() {
+ return is_cash;
+ }
+
+ public void setIs_cash(String is_cash) {
+ this.is_cash = is_cash;
+ }
+
+ public String getSubj_nature_code() {
+ return subj_nature_code;
+ }
+
+ public void setSubj_nature_code(String subj_nature_code) {
+ this.subj_nature_code = subj_nature_code;
+ }
+
+ public String getIs_check() {
+ return is_check;
+ }
+
+ public void setIs_check(String is_check) {
+ this.is_check = is_check;
+ }
+
+ public String getIs_stop() {
+ return is_stop;
+ }
+
+ public void setIs_stop(String is_stop) {
+ this.is_stop = is_stop;
+ }
+
+ public String getBudg_subj_code() {
+ return budg_subj_code;
+ }
+
+ public void setBudg_subj_code(String budg_subj_code) {
+ this.budg_subj_code = budg_subj_code;
+ }
+
+ public String getBudg_subj_name() {
+ return budg_subj_name;
+ }
+
+ public void setBudg_subj_name(String budg_subj_name) {
+ this.budg_subj_name = budg_subj_name;
+ }
+
+ public String getCheck_type_name1() {
+ return check_type_name1;
+ }
+
+ public void setCheck_type_name1(String check_type_name1) {
+ this.check_type_name1 = check_type_name1;
+ }
+
+ public String getCheck_type_name2() {
+ return check_type_name2;
+ }
+
+ public void setCheck_type_name2(String check_type_name2) {
+ this.check_type_name2 = check_type_name2;
+ }
+
+ public String getCheck_type_name3() {
+ return check_type_name3;
+ }
+
+ public void setCheck_type_name3(String check_type_name3) {
+ this.check_type_name3 = check_type_name3;
+ }
+
+ public String getCheck_type_name4() {
+ return check_type_name4;
+ }
+
+ public void setCheck_type_name4(String check_type_name4) {
+ this.check_type_name4 = check_type_name4;
+ }
+
+ public String getCheck_type_name5() {
+ return check_type_name5;
+ }
+
+ public void setCheck_type_name5(String check_type_name5) {
+ this.check_type_name5 = check_type_name5;
+ }
+
+ public String getCheck_type_name6() {
+ return check_type_name6;
+ }
+
+ public void setCheck_type_name6(String check_type_name6) {
+ this.check_type_name6 = check_type_name6;
+ }
+
+ public String getCheck_type_name7() {
+ return check_type_name7;
+ }
+
+ public void setCheck_type_name7(String check_type_name7) {
+ this.check_type_name7 = check_type_name7;
+ }
+
+ public String getCheck_type_name8() {
+ return check_type_name8;
+ }
+
+ public void setCheck_type_name8(String check_type_name8) {
+ this.check_type_name8 = check_type_name8;
+ }
+
+ public String getOrg_code() {
+ return org_code;
+ }
+
+ public void setOrg_code(String org_code) {
+ this.org_code = org_code;
+ }
+
+ public String getOrg_name() {
+ return org_name;
+ }
+
+ public void setOrg_name(String org_name) {
+ this.org_name = org_name;
+ }
+
+ public String getBranch_code() {
+ return branch_code;
+ }
+
+ public void setBranch_code(String branch_code) {
+ this.branch_code = branch_code;
+ }
+
+ public String getBranch_name() {
+ return branch_name;
+ }
+
+ public void setBranch_name(String branch_name) {
+ this.branch_name = branch_name;
+ }
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntity.xml
new file mode 100644
index 00000000..075cf3bf
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntity.xml
@@ -0,0 +1,270 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ acct_year
+ ,acct_subj_code
+ ,acct_subj_name
+ ,supper_code
+ ,subj_level
+ ,is_last
+ ,subj_type_code
+ ,subj_type_name
+ ,direction
+ ,is_cash
+ ,subj_nature_code
+ ,is_check
+ ,is_stop
+ ,budg_subj_code
+ ,budg_subj_name
+ ,check_type_name1
+ ,check_type_name2
+ ,check_type_name3
+ ,check_type_name4
+ ,check_type_name5
+ ,check_type_name6
+ ,check_type_name7
+ ,check_type_name8
+ ,org_code
+ ,org_name
+ ,branch_code
+ ,branch_name
+
+
+
+ select
+
+ from dict_acct_subj
+
+ and acct_year = #{acct_year}
+ and acct_subj_code = #{acct_subj_code}
+ and acct_subj_name = #{acct_subj_name}
+ and supper_code = #{supper_code}
+ and subj_level = #{subj_level}
+ and is_last = #{is_last}
+ and subj_type_code = #{subj_type_code}
+ and subj_type_name = #{subj_type_name}
+ and direction = #{direction}
+ and is_cash = #{is_cash}
+ and subj_nature_code = #{subj_nature_code}
+ and is_check = #{is_check}
+ and is_stop = #{is_stop}
+ and budg_subj_code = #{budg_subj_code}
+ and budg_subj_name = #{budg_subj_name}
+ and check_type_name1 = #{check_type_name1}
+ and check_type_name2 = #{check_type_name2}
+ and check_type_name3 = #{check_type_name3}
+ and check_type_name4 = #{check_type_name4}
+ and check_type_name5 = #{check_type_name5}
+ and check_type_name6 = #{check_type_name6}
+ and check_type_name7 = #{check_type_name7}
+ and check_type_name8 = #{check_type_name8}
+ and org_code = #{org_code}
+ and org_name = #{org_name}
+ and branch_code = #{branch_code}
+ and branch_name = #{branch_name}
+
+
+
+
+
+ select count(1) from dict_acct_subj
+
+ and acct_year = #{acct_year}
+ and acct_subj_code = #{acct_subj_code}
+ and acct_subj_name = #{acct_subj_name}
+ and supper_code = #{supper_code}
+ and subj_level = #{subj_level}
+ and is_last = #{is_last}
+ and subj_type_code = #{subj_type_code}
+ and subj_type_name = #{subj_type_name}
+ and direction = #{direction}
+ and is_cash = #{is_cash}
+ and subj_nature_code = #{subj_nature_code}
+ and is_check = #{is_check}
+ and is_stop = #{is_stop}
+ and budg_subj_code = #{budg_subj_code}
+ and budg_subj_name = #{budg_subj_name}
+ and check_type_name1 = #{check_type_name1}
+ and check_type_name2 = #{check_type_name2}
+ and check_type_name3 = #{check_type_name3}
+ and check_type_name4 = #{check_type_name4}
+ and check_type_name5 = #{check_type_name5}
+ and check_type_name6 = #{check_type_name6}
+ and check_type_name7 = #{check_type_name7}
+ and check_type_name8 = #{check_type_name8}
+ and org_code = #{org_code}
+ and org_name = #{org_name}
+ and branch_code = #{branch_code}
+ and branch_name = #{branch_name}
+
+
+
+
+
+ select
+
+ from dict_acct_subj
+
+ and acct_year like concat('%',#{acct_year},'%')
+ and acct_subj_code like concat('%',#{acct_subj_code},'%')
+ and acct_subj_name like concat('%',#{acct_subj_name},'%')
+ and supper_code like concat('%',#{supper_code},'%')
+ and subj_level like concat('%',#{subj_level},'%')
+ and is_last like concat('%',#{is_last},'%')
+ and subj_type_code like concat('%',#{subj_type_code},'%')
+ and subj_type_name like concat('%',#{subj_type_name},'%')
+ and direction like concat('%',#{direction},'%')
+ and is_cash like concat('%',#{is_cash},'%')
+ and subj_nature_code like concat('%',#{subj_nature_code},'%')
+ and is_check like concat('%',#{is_check},'%')
+ and is_stop like concat('%',#{is_stop},'%')
+ and budg_subj_code like concat('%',#{budg_subj_code},'%')
+ and budg_subj_name like concat('%',#{budg_subj_name},'%')
+ and check_type_name1 like concat('%',#{check_type_name1},'%')
+ and check_type_name2 like concat('%',#{check_type_name2},'%')
+ and check_type_name3 like concat('%',#{check_type_name3},'%')
+ and check_type_name4 like concat('%',#{check_type_name4},'%')
+ and check_type_name5 like concat('%',#{check_type_name5},'%')
+ and check_type_name6 like concat('%',#{check_type_name6},'%')
+ and check_type_name7 like concat('%',#{check_type_name7},'%')
+ and check_type_name8 like concat('%',#{check_type_name8},'%')
+ and org_code like concat('%',#{org_code},'%')
+ and org_name like concat('%',#{org_name},'%')
+ and branch_code like concat('%',#{branch_code},'%')
+ and branch_name like concat('%',#{branch_name},'%')
+
+
+
+
+
+ select
+
+ from dict_acct_subj
+
+ or acct_year = #{acct_year}
+ or acct_subj_code = #{acct_subj_code}
+ or acct_subj_name = #{acct_subj_name}
+ or supper_code = #{supper_code}
+ or subj_level = #{subj_level}
+ or is_last = #{is_last}
+ or subj_type_code = #{subj_type_code}
+ or subj_type_name = #{subj_type_name}
+ or direction = #{direction}
+ or is_cash = #{is_cash}
+ or subj_nature_code = #{subj_nature_code}
+ or is_check = #{is_check}
+ or is_stop = #{is_stop}
+ or budg_subj_code = #{budg_subj_code}
+ or budg_subj_name = #{budg_subj_name}
+ or check_type_name1 = #{check_type_name1}
+ or check_type_name2 = #{check_type_name2}
+ or check_type_name3 = #{check_type_name3}
+ or check_type_name4 = #{check_type_name4}
+ or check_type_name5 = #{check_type_name5}
+ or check_type_name6 = #{check_type_name6}
+ or check_type_name7 = #{check_type_name7}
+ or check_type_name8 = #{check_type_name8}
+ or org_code = #{org_code}
+ or org_name = #{org_name}
+ or branch_code = #{branch_code}
+ or branch_name = #{branch_name}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select
+
+ from dict_acct_subj
+
+ and acct_year like '%${acct_year}%'
+ and acct_subj_code like '%${acct_subj_code}%'
+ and acct_subj_name like '%${acct_subj_name}%'
+ and supper_code like '%${supper_code}%'
+ and subj_level like '%${subj_level}%'
+ and is_last like '%${is_last}%'
+ and subj_type_code like '%${subj_type_code}%'
+ and subj_type_name like '%${subj_type_name}%'
+ and direction like '%${direction}%'
+ and is_cash like '%${is_cash}%'
+ and subj_nature_code like '%${subj_nature_code}%'
+ and is_check like '%${is_check}%'
+ and is_stop like '%${is_stop}%'
+ and budg_subj_code like '%${budg_subj_code}%'
+ and budg_subj_name like '%${budg_subj_name}%'
+ and check_type_name1 like '%${check_type_name1}%'
+ and check_type_name2 like '%${check_type_name2}%'
+ and check_type_name3 like '%${check_type_name3}%'
+ and check_type_name4 like '%${check_type_name4}%'
+ and check_type_name5 like '%${check_type_name5}%'
+ and check_type_name6 like '%${check_type_name6}%'
+ and check_type_name7 like '%${check_type_name7}%'
+ and check_type_name8 like '%${check_type_name8}%'
+ and org_code like '%${org_code}%'
+ and org_name like '%${org_name}%'
+ and branch_code like '%${branch_code}%'
+ and branch_name like '%${branch_name}%'
+
+
+
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntityVo.java b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntityVo.java
new file mode 100644
index 00000000..2aa0f0bd
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/entity/DictAcctSubjEntityVo.java
@@ -0,0 +1,284 @@
+package com.hzya.frame.grpU8.dictAcctSubj.entity;
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/**
+ * 子表(DictAcctSubj)实体类
+ *
+ * @author makejava
+ * @since 2024-07-09 11:23:36
+ */
+public class DictAcctSubjEntityVo {
+
+ /** 年度 */
+ private String acct_year;
+ /** 会计科目编码 */
+ private String acct_subj_code;
+ /** 会计科目名称 */
+ private String acct_subj_name;
+ /** 上级编码 */
+ private String supper_code;
+ /** 科目级次 */
+ private String subj_level;
+ /** 是否末级 */
+ private String is_last;
+ /** 科目类型编码 */
+ private String subj_type_code;
+ /** 科目类型名称 */
+ private String subj_type_name;
+ /** 借贷方向 */
+ private String direction;
+ /** 是否现金 */
+ private String is_cash;
+ /** 科目性质 */
+ private String subj_nature_code;
+ /** 是否辅助核算 */
+ private String is_check;
+ /** 是否停用 */
+ private String is_stop;
+ /** 预算会计科目编码 */
+ private String budg_subj_code;
+ /** 预算会计科目名称 */
+ private String budg_subj_name;
+ /** 辅助核算项1 */
+ private String check_type_name1;
+ /** 辅助核算项2 */
+ private String check_type_name2;
+ /** 辅助核算项3 */
+ private String check_type_name3;
+ /** 辅助核算项4 */
+ private String check_type_name4;
+ /** 辅助核算项5 */
+ private String check_type_name5;
+ /** 辅助核算项6 */
+ private String check_type_name6;
+ /** 辅助核算项7 */
+ private String check_type_name7;
+ /** 辅助核算项8 */
+ private String check_type_name8;
+ /** 单位编码 */
+ private String org_code;
+ /** 单位名称 */
+ private String org_name;
+ /** 院区编码 */
+ private String branch_code;
+ /** 院区名称 */
+ private String branch_name;
+
+ public String getAcct_year() {
+ return acct_year;
+ }
+
+ public void setAcct_year(String acct_year) {
+ this.acct_year = acct_year;
+ }
+
+ public String getAcct_subj_code() {
+ return acct_subj_code;
+ }
+
+ public void setAcct_subj_code(String acct_subj_code) {
+ this.acct_subj_code = acct_subj_code;
+ }
+
+ public String getAcct_subj_name() {
+ return acct_subj_name;
+ }
+
+ public void setAcct_subj_name(String acct_subj_name) {
+ this.acct_subj_name = acct_subj_name;
+ }
+
+ public String getSupper_code() {
+ return supper_code;
+ }
+
+ public void setSupper_code(String supper_code) {
+ this.supper_code = supper_code;
+ }
+
+ public String getSubj_level() {
+ return subj_level;
+ }
+
+ public void setSubj_level(String subj_level) {
+ this.subj_level = subj_level;
+ }
+
+ public String getIs_last() {
+ return is_last;
+ }
+
+ public void setIs_last(String is_last) {
+ this.is_last = is_last;
+ }
+
+ public String getSubj_type_code() {
+ return subj_type_code;
+ }
+
+ public void setSubj_type_code(String subj_type_code) {
+ this.subj_type_code = subj_type_code;
+ }
+
+ public String getSubj_type_name() {
+ return subj_type_name;
+ }
+
+ public void setSubj_type_name(String subj_type_name) {
+ this.subj_type_name = subj_type_name;
+ }
+
+ public String getDirection() {
+ return direction;
+ }
+
+ public void setDirection(String direction) {
+ this.direction = direction;
+ }
+
+ public String getIs_cash() {
+ return is_cash;
+ }
+
+ public void setIs_cash(String is_cash) {
+ this.is_cash = is_cash;
+ }
+
+ public String getSubj_nature_code() {
+ return subj_nature_code;
+ }
+
+ public void setSubj_nature_code(String subj_nature_code) {
+ this.subj_nature_code = subj_nature_code;
+ }
+
+ public String getIs_check() {
+ return is_check;
+ }
+
+ public void setIs_check(String is_check) {
+ this.is_check = is_check;
+ }
+
+ public String getIs_stop() {
+ return is_stop;
+ }
+
+ public void setIs_stop(String is_stop) {
+ this.is_stop = is_stop;
+ }
+
+ public String getBudg_subj_code() {
+ return budg_subj_code;
+ }
+
+ public void setBudg_subj_code(String budg_subj_code) {
+ this.budg_subj_code = budg_subj_code;
+ }
+
+ public String getBudg_subj_name() {
+ return budg_subj_name;
+ }
+
+ public void setBudg_subj_name(String budg_subj_name) {
+ this.budg_subj_name = budg_subj_name;
+ }
+
+ public String getCheck_type_name1() {
+ return check_type_name1;
+ }
+
+ public void setCheck_type_name1(String check_type_name1) {
+ this.check_type_name1 = check_type_name1;
+ }
+
+ public String getCheck_type_name2() {
+ return check_type_name2;
+ }
+
+ public void setCheck_type_name2(String check_type_name2) {
+ this.check_type_name2 = check_type_name2;
+ }
+
+ public String getCheck_type_name3() {
+ return check_type_name3;
+ }
+
+ public void setCheck_type_name3(String check_type_name3) {
+ this.check_type_name3 = check_type_name3;
+ }
+
+ public String getCheck_type_name4() {
+ return check_type_name4;
+ }
+
+ public void setCheck_type_name4(String check_type_name4) {
+ this.check_type_name4 = check_type_name4;
+ }
+
+ public String getCheck_type_name5() {
+ return check_type_name5;
+ }
+
+ public void setCheck_type_name5(String check_type_name5) {
+ this.check_type_name5 = check_type_name5;
+ }
+
+ public String getCheck_type_name6() {
+ return check_type_name6;
+ }
+
+ public void setCheck_type_name6(String check_type_name6) {
+ this.check_type_name6 = check_type_name6;
+ }
+
+ public String getCheck_type_name7() {
+ return check_type_name7;
+ }
+
+ public void setCheck_type_name7(String check_type_name7) {
+ this.check_type_name7 = check_type_name7;
+ }
+
+ public String getCheck_type_name8() {
+ return check_type_name8;
+ }
+
+ public void setCheck_type_name8(String check_type_name8) {
+ this.check_type_name8 = check_type_name8;
+ }
+
+ public String getOrg_code() {
+ return org_code;
+ }
+
+ public void setOrg_code(String org_code) {
+ this.org_code = org_code;
+ }
+
+ public String getOrg_name() {
+ return org_name;
+ }
+
+ public void setOrg_name(String org_name) {
+ this.org_name = org_name;
+ }
+
+ public String getBranch_code() {
+ return branch_code;
+ }
+
+ public void setBranch_code(String branch_code) {
+ this.branch_code = branch_code;
+ }
+
+ public String getBranch_name() {
+ return branch_name;
+ }
+
+ public void setBranch_name(String branch_name) {
+ this.branch_name = branch_name;
+ }
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/IDictAcctSubjService.java b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/IDictAcctSubjService.java
new file mode 100644
index 00000000..cfc15097
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/IDictAcctSubjService.java
@@ -0,0 +1,22 @@
+package com.hzya.frame.grpU8.dictAcctSubj.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+/**
+ * 子表(DictAcctSubj)表服务接口
+ *
+ * @author makejava
+ * @since 2024-07-09 11:23:36
+ */
+public interface IDictAcctSubjService extends IBaseService{
+ /**
+ * @param jsonObject
+ * @return com.hzya.frame.web.entity.JsonResultEntity
+ * @Author lvleigang
+ * @Description 数据表
+ * @Date 11:52 上午 2024/3/27
+ **/
+ JsonResultEntity queryData(JSONObject jsonObject);
+}
diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/impl/DictAcctSubjServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/impl/DictAcctSubjServiceImpl.java
new file mode 100644
index 00000000..3e06e6bc
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/impl/DictAcctSubjServiceImpl.java
@@ -0,0 +1,61 @@
+package com.hzya.frame.grpU8.dictAcctSubj.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity;
+import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntityVo;
+import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntity;
+import com.hzya.frame.grpU8.dictAcctSubj.dao.IDictAcctSubjDao;
+import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntityVo;
+import com.hzya.frame.grpU8.dictAcctSubj.service.IDictAcctSubjService;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import com.hzya.frame.basedao.service.impl.BaseService;
+
+import java.util.List;
+
+/**
+ * 子表(DictAcctSubj)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-07-09 11:23:36
+ */
+@Service(value = "dictAcctSubjService")
+public class DictAcctSubjServiceImpl extends BaseService implements IDictAcctSubjService {
+
+ private IDictAcctSubjDao dictAcctSubjDao;
+
+ @Autowired
+ public void setDictAcctSubjDao(IDictAcctSubjDao dao) {
+ this.dictAcctSubjDao = dao;
+ this.dao = dao;
+ }
+ /**
+ * @param jsonObject
+ * @return com.hzya.frame.web.entity.JsonResultEntity
+ * @Author lvleigang
+ * @Description 数据表
+ * @Date 11:52 上午 2024/3/27
+ **/
+ @Override
+ public JsonResultEntity queryData(JSONObject jsonObject) {
+ DictAcctSubjEntity entity = getData("jsonStr", jsonObject, DictAcctSubjEntity.class);
+ if(entity == null ){
+ entity = new DictAcctSubjEntity();
+ }
+ //判断分页
+ if (entity.getPageNum() != null && entity.getPageSize() != null) {
+ PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
+ List list = dictAcctSubjDao.queryData(entity);
+ PageInfo pageInfo = new PageInfo(list);
+ return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
+ }else {
+ List list = dictAcctSubjDao.queryData(entity);
+ return BaseResult.getSuccessMessageEntity("查询数据成功", list);
+ }
+ }
+}
diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/IDictCheckTypeDao.java b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/IDictCheckTypeDao.java
new file mode 100644
index 00000000..1033b8fe
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/IDictCheckTypeDao.java
@@ -0,0 +1,19 @@
+package com.hzya.frame.grpU8.dictCheckType.dao;
+
+import com.hzya.frame.grpU8.dictCheckType.entity.DictCheckTypeEntity;
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.grpU8.dictCheckType.entity.DictCheckTypeEntityVo;
+
+import java.util.List;
+
+/**
+ * 子表(dict_check_type: table)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-07-09 11:24:25
+ */
+public interface IDictCheckTypeDao extends IBaseDao {
+
+ List queryData(DictCheckTypeEntity entity);
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java
new file mode 100644
index 00000000..a0b0809d
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java
@@ -0,0 +1,28 @@
+package com.hzya.frame.grpU8.dictCheckType.dao.impl;
+
+import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntity;
+import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntityVo;
+import com.hzya.frame.grpU8.dictCheckType.entity.DictCheckTypeEntity;
+import com.hzya.frame.grpU8.dictCheckType.dao.IDictCheckTypeDao;
+import com.hzya.frame.grpU8.dictCheckType.entity.DictCheckTypeEntityVo;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+
+import java.util.List;
+
+/**
+ * 子表(DictCheckType)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-07-09 11:24:25
+ */
+@Repository(value = "DictCheckTypeDaoImpl")
+public class DictCheckTypeDaoImpl extends MybatisGenericDao implements IDictCheckTypeDao{
+
+ @Override
+ public List queryData(DictCheckTypeEntity entity) {
+ List o = (List) super.selectList(getSqlIdPrifx() + "queryData", entity);
+ return o;
+ }
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntity.java b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntity.java
new file mode 100644
index 00000000..c4660d7e
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntity.java
@@ -0,0 +1,74 @@
+package com.hzya.frame.grpU8.dictCheckType.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 子表(DictCheckType)实体类
+ *
+ * @author makejava
+ * @since 2024-07-09 11:24:25
+ */
+public class DictCheckTypeEntity extends BaseEntity {
+
+ /** 辅助核算项编码 */
+ private String check_type_code;
+ /** 辅助核算项名称 */
+ private String check_type_name;
+ /** 单位编码 */
+ private String org_code;
+ /** 单位名称 */
+ private String org_name;
+ /** 院区编码 */
+ private String branch_code;
+ /** 院区名称 */
+ private String branch_name;
+
+ public String getCheck_type_code() {
+ return check_type_code;
+ }
+
+ public void setCheck_type_code(String check_type_code) {
+ this.check_type_code = check_type_code;
+ }
+
+ public String getCheck_type_name() {
+ return check_type_name;
+ }
+
+ public void setCheck_type_name(String check_type_name) {
+ this.check_type_name = check_type_name;
+ }
+
+ public String getOrg_code() {
+ return org_code;
+ }
+
+ public void setOrg_code(String org_code) {
+ this.org_code = org_code;
+ }
+
+ public String getOrg_name() {
+ return org_name;
+ }
+
+ public void setOrg_name(String org_name) {
+ this.org_name = org_name;
+ }
+
+ public String getBranch_code() {
+ return branch_code;
+ }
+
+ public void setBranch_code(String branch_code) {
+ this.branch_code = branch_code;
+ }
+
+ public String getBranch_name() {
+ return branch_name;
+ }
+
+ public void setBranch_name(String branch_name) {
+ this.branch_name = branch_name;
+ }
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntity.xml
new file mode 100644
index 00000000..b5ca26b7
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntity.xml
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ check_type_code
+ ,check_type_name
+ ,org_code
+ ,org_name
+ ,branch_code
+ ,branch_name
+
+
+
+ select
+
+ from dict_check_type
+
+ and check_type_code = #{check_type_code}
+ and check_type_name = #{check_type_name}
+ and org_code = #{org_code}
+ and org_name = #{org_name}
+ and branch_code = #{branch_code}
+ and branch_name = #{branch_name}
+
+
+
+
+
+ select count(1) from dict_check_type
+
+ and check_type_code = #{check_type_code}
+ and check_type_name = #{check_type_name}
+ and org_code = #{org_code}
+ and org_name = #{org_name}
+ and branch_code = #{branch_code}
+ and branch_name = #{branch_name}
+
+
+
+
+
+ select
+
+ from dict_check_type
+
+ and check_type_code like concat('%',#{check_type_code},'%')
+ and check_type_name like concat('%',#{check_type_name},'%')
+ and org_code like concat('%',#{org_code},'%')
+ and org_name like concat('%',#{org_name},'%')
+ and branch_code like concat('%',#{branch_code},'%')
+ and branch_name like concat('%',#{branch_name},'%')
+
+
+
+
+
+ select
+
+ from dict_check_type
+
+ or check_type_code = #{check_type_code}
+ or check_type_name = #{check_type_name}
+ or org_code = #{org_code}
+ or org_name = #{org_name}
+ or branch_code = #{branch_code}
+ or branch_name = #{branch_name}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select
+
+ from dict_check_type
+
+ and check_type_code like '%${check_type_code}%'
+ and check_type_name like '%${check_type_name}%'
+ and org_code like '%${org_code}%'
+ and org_name like '%${org_name}%'
+ and branch_code like '%${branch_code}%'
+ and branch_name like '%${branch_name}%'
+
+
+
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntityVo.java b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntityVo.java
new file mode 100644
index 00000000..8fbbf83a
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/entity/DictCheckTypeEntityVo.java
@@ -0,0 +1,74 @@
+package com.hzya.frame.grpU8.dictCheckType.entity;
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/**
+ * 子表(DictCheckType)实体类
+ *
+ * @author makejava
+ * @since 2024-07-09 11:24:25
+ */
+public class DictCheckTypeEntityVo {
+
+ /** 辅助核算项编码 */
+ private String check_type_code;
+ /** 辅助核算项名称 */
+ private String check_type_name;
+ /** 单位编码 */
+ private String org_code;
+ /** 单位名称 */
+ private String org_name;
+ /** 院区编码 */
+ private String branch_code;
+ /** 院区名称 */
+ private String branch_name;
+
+ public String getCheck_type_code() {
+ return check_type_code;
+ }
+
+ public void setCheck_type_code(String check_type_code) {
+ this.check_type_code = check_type_code;
+ }
+
+ public String getCheck_type_name() {
+ return check_type_name;
+ }
+
+ public void setCheck_type_name(String check_type_name) {
+ this.check_type_name = check_type_name;
+ }
+
+ public String getOrg_code() {
+ return org_code;
+ }
+
+ public void setOrg_code(String org_code) {
+ this.org_code = org_code;
+ }
+
+ public String getOrg_name() {
+ return org_name;
+ }
+
+ public void setOrg_name(String org_name) {
+ this.org_name = org_name;
+ }
+
+ public String getBranch_code() {
+ return branch_code;
+ }
+
+ public void setBranch_code(String branch_code) {
+ this.branch_code = branch_code;
+ }
+
+ public String getBranch_name() {
+ return branch_name;
+ }
+
+ public void setBranch_name(String branch_name) {
+ this.branch_name = branch_name;
+ }
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/IDictCheckTypeService.java b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/IDictCheckTypeService.java
new file mode 100644
index 00000000..6fb1e77f
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/IDictCheckTypeService.java
@@ -0,0 +1,22 @@
+package com.hzya.frame.grpU8.dictCheckType.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import com.hzya.frame.grpU8.dictCheckType.entity.DictCheckTypeEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+/**
+ * 子表(DictCheckType)表服务接口
+ *
+ * @author makejava
+ * @since 2024-07-09 11:24:25
+ */
+public interface IDictCheckTypeService extends IBaseService{
+ /**
+ * @param jsonObject
+ * @return com.hzya.frame.web.entity.JsonResultEntity
+ * @Author lvleigang
+ * @Description 数据表
+ * @Date 11:52 上午 2024/3/27
+ **/
+ JsonResultEntity queryData(JSONObject jsonObject);
+}
diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/impl/DictCheckTypeServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/impl/DictCheckTypeServiceImpl.java
new file mode 100644
index 00000000..344f56b5
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/impl/DictCheckTypeServiceImpl.java
@@ -0,0 +1,61 @@
+package com.hzya.frame.grpU8.dictCheckType.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntity;
+import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntityVo;
+import com.hzya.frame.grpU8.dictCheckType.entity.DictCheckTypeEntity;
+import com.hzya.frame.grpU8.dictCheckType.dao.IDictCheckTypeDao;
+import com.hzya.frame.grpU8.dictCheckType.entity.DictCheckTypeEntityVo;
+import com.hzya.frame.grpU8.dictCheckType.service.IDictCheckTypeService;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import com.hzya.frame.basedao.service.impl.BaseService;
+
+import java.util.List;
+
+/**
+ * 子表(DictCheckType)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-07-09 11:24:25
+ */
+@Service(value = "dictCheckTypeService")
+public class DictCheckTypeServiceImpl extends BaseService implements IDictCheckTypeService {
+
+ private IDictCheckTypeDao dictCheckTypeDao;
+
+ @Autowired
+ public void setDictCheckTypeDao(IDictCheckTypeDao dao) {
+ this.dictCheckTypeDao = dao;
+ this.dao = dao;
+ }
+ /**
+ * @param jsonObject
+ * @return com.hzya.frame.web.entity.JsonResultEntity
+ * @Author lvleigang
+ * @Description 数据表
+ * @Date 11:52 上午 2024/3/27
+ **/
+ @Override
+ public JsonResultEntity queryData(JSONObject jsonObject) {
+ DictCheckTypeEntity entity = getData("jsonStr", jsonObject, DictCheckTypeEntity.class);
+ if(entity == null ){
+ entity = new DictCheckTypeEntity();
+ }
+ //判断分页
+ if (entity.getPageNum() != null && entity.getPageSize() != null) {
+ PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
+ List list = dictCheckTypeDao.queryData(entity);
+ PageInfo pageInfo = new PageInfo(list);
+ return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
+ }else {
+ List list = dictCheckTypeDao.queryData(entity);
+ return BaseResult.getSuccessMessageEntity("查询数据成功", list);
+ }
+ }
+}
From 9e619c8425db3d5d11a03531db62b93125b3e289 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Fri, 9 Aug 2024 10:28:20 +0800
Subject: [PATCH 18/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/MdmModuleServiceImpl.java | 212 ++++++++++--------
1 file changed, 114 insertions(+), 98 deletions(-)
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
index ab8ea9f8..82c9f218 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
@@ -173,7 +173,6 @@ public class MdmModuleServiceImpl extends BaseService i
}
-
//删除单据规则
MdmTableCodeRuleEntity mdmTableCodeRuleEntity = new MdmTableCodeRuleEntity();
mdmTableCodeRuleEntity.setUpdate();
@@ -313,7 +312,7 @@ public class MdmModuleServiceImpl extends BaseService i
entity.setCreate();
mdmModuleDao.save(entity);
entity = mdmModuleDao.get(entity.getId());
- return BaseResult.getSuccessMessageEntity("保存成功",entity);
+ return BaseResult.getSuccessMessageEntity("保存成功", entity);
}
/**
@@ -479,7 +478,7 @@ public class MdmModuleServiceImpl extends BaseService i
mdmModuleDbEntity.setMdmId(entity.getMdmId());
mdmModuleDbEntity.setDbName(entity.getDbName() + "_option_log");
mdmModuleDbEntity.setDbType("3");
- mdmModuleDbEntity.setRemark(entity.getRemark()+"操作日志");
+ mdmModuleDbEntity.setRemark(entity.getRemark() + "操作日志");
mdmModuleDbEntity.setCreate();
mdmModuleDbEntity.setDataType("1");
mdmModuleDbEntities.add(mdmModuleDbEntity);
@@ -490,7 +489,7 @@ public class MdmModuleServiceImpl extends BaseService i
mdmModuleDbEntity1.setMdmId(entity.getMdmId());
mdmModuleDbEntity1.setDbName(entity.getDbName() + "_send_log");
mdmModuleDbEntity1.setDbType("4");
- mdmModuleDbEntity1.setRemark(entity.getRemark()+"下发日志");
+ mdmModuleDbEntity1.setRemark(entity.getRemark() + "下发日志");
mdmModuleDbEntity1.setCreate();
mdmModuleDbEntity1.setDataType("1");
mdmModuleDbEntities.add(mdmModuleDbEntity1);
@@ -503,7 +502,7 @@ public class MdmModuleServiceImpl extends BaseService i
mdmModuleDbEntity.setDbName(mdmModuleDbEntities.get(i).getDbName());
mdmModuleDbEntity.setSts("Y");
int a = mdmModuleDbDao.getCount(mdmModuleDbEntity);
- if(a > 0){
+ if (a > 0) {
return BaseResult.getFailureMessageEntity("表已存在,请修改");
}
}
@@ -1324,6 +1323,7 @@ public class MdmModuleServiceImpl extends BaseService i
}
return BaseResult.getSuccessMessageEntity("获取数据源表字段成功", dbEntities);
}
+
/**
* @param object
* @return com.hzya.frame.web.entity.JsonResultEntity
@@ -1364,6 +1364,7 @@ public class MdmModuleServiceImpl extends BaseService i
}
return BaseResult.getSuccessMessageEntity("获取数据源表字段成功", entity);
}
+
/**
* @param object
* @return com.hzya.frame.web.entity.JsonResultEntity
@@ -1403,22 +1404,22 @@ public class MdmModuleServiceImpl extends BaseService i
mdmModuleDbFiledsEntity.setMdmId(entity.getMdmId());
mdmModuleDbFiledsEntity.setSts("Y");
List mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
- if(mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0){
+ if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
for (int i = 0; i < mdmModuleDbFiledsEntityList.size(); i++) {
- if(entity.getDbId().equals(mdmModuleDbFiledsEntityList.get(i).getDbId()) && entity.getEnName().equals(mdmModuleDbFiledsEntityList.get(i).getEnName())){
+ if (entity.getDbId().equals(mdmModuleDbFiledsEntityList.get(i).getDbId()) && entity.getEnName().equals(mdmModuleDbFiledsEntityList.get(i).getEnName())) {
return BaseResult.getFailureMessageEntity("字段已存在,请修改");
}
}
}
entity.setCreate();
- if("1".equals(entity.getDbType())){
+ if ("1".equals(entity.getDbType())) {
entity.setAddType("1");
entity.setUpdateType("1");
entity.setShowType("1");
entity.setQueryType("1");
entity.setListType("1");
entity.setViewType("1");
- }else {
+ } else {
entity.setAddType("1");
entity.setUpdateType("1");
entity.setShowType("1");
@@ -1484,7 +1485,7 @@ public class MdmModuleServiceImpl extends BaseService i
entity.setDataType("2");
try {
mdmModuleDao.alterTableField(entity);
- } catch (Exception e){
+ } catch (Exception e) {
throw new BaseSystemException("表字段类型,修改失败,请联系管理员");
}
List mdmModuleDbFiledsEntities = new ArrayList<>();
@@ -1678,9 +1679,9 @@ public class MdmModuleServiceImpl extends BaseService i
}
List moduleViewEntities = mdmModuleViewDao.queryBase(entity);
- if(moduleViewEntities == null || moduleViewEntities.size() == 0){
+ if (moduleViewEntities == null || moduleViewEntities.size() == 0) {
return BaseResult.getSuccessMessageEntity("获取显示类型成功");
- }else if (moduleViewEntities != null && moduleViewEntities.size() > 1) {
+ } else if (moduleViewEntities != null && moduleViewEntities.size() > 1) {
return BaseResult.getFailureMessageEntity("获取显示类型失败");
} else {
return BaseResult.getSuccessMessageEntity("获取显示类型成功", moduleViewEntities.get(0));
@@ -1707,10 +1708,10 @@ public class MdmModuleServiceImpl extends BaseService i
SysMenuConfigEntity module = new SysMenuConfigEntity();
module.setCreate();
module.setFormId(mdmModuleEntity.getId());
- if("1".equals(mdmModuleEntity.getMdmType())){
+ if ("1".equals(mdmModuleEntity.getMdmType())) {
//1、档案
module.setParentMenuId("ea22757e99c144fb9ef381dd322e233c");
- }else {
+ } else {
//2、单据
module.setParentMenuId("58714ddb7ec94f5da91df74efada042f");
}
@@ -1746,7 +1747,7 @@ public class MdmModuleServiceImpl extends BaseService i
List mdmModuleViewButtonEntities = mdmModuleViewButtonDao.queryBase(mdmModuleViewButtonEntity);
//删除处理权限
- doMdmModuleButton(module,mdmModuleViewButtonEntities,sysButtonConfigEntities,sysPopedomOperateEntities);
+ doMdmModuleButton(module, mdmModuleViewButtonEntities, sysButtonConfigEntities, sysPopedomOperateEntities);
return BaseResult.getSuccessMessageEntity("保存显示类型成功");
}
@@ -1775,14 +1776,14 @@ public class MdmModuleServiceImpl extends BaseService i
module.setFormId(mdmModuleEntity.getId());
List sysMenuConfigEntities = sysMenuConfigDao.queryBase(module);
- if(sysMenuConfigEntities != null && sysMenuConfigEntities.size() == 1){
+ if (sysMenuConfigEntities != null && sysMenuConfigEntities.size() == 1) {
module = sysMenuConfigEntities.get(0);
module.setUpdate();
module.setFormId(mdmModuleEntity.getId());
- if("1".equals(mdmModuleEntity.getMdmType())){
+ if ("1".equals(mdmModuleEntity.getMdmType())) {
//1、档案
module.setParentMenuId("ea22757e99c144fb9ef381dd322e233c");
- }else {
+ } else {
//2、单据
module.setParentMenuId("58714ddb7ec94f5da91df74efada042f");
}
@@ -1818,7 +1819,7 @@ public class MdmModuleServiceImpl extends BaseService i
List mdmModuleViewButtonEntities = mdmModuleViewButtonDao.queryBase(mdmModuleViewButtonEntity);
//删除处理权限
- doMdmModuleButton(module,mdmModuleViewButtonEntities,sysButtonConfigEntities,sysPopedomOperateEntities);
+ doMdmModuleButton(module, mdmModuleViewButtonEntities, sysButtonConfigEntities, sysPopedomOperateEntities);
}
return BaseResult.getSuccessMessageEntity("修改显示类型成功");
}
@@ -1885,9 +1886,9 @@ public class MdmModuleServiceImpl extends BaseService i
switch (mdmModuleViewDetailEntityList.get(i).getViewType()) {
//1、查询2、列表3、新增4、修改 5、查看
case "1":
- if(mdmModuleViewVo.getQueryFiled() != null && mdmModuleViewVo.getQueryFiled().size() > 0 ){
+ if (mdmModuleViewVo.getQueryFiled() != null && mdmModuleViewVo.getQueryFiled().size() > 0) {
for (int i1 = 0; i1 < mdmModuleViewVo.getQueryFiled().size(); i1++) {
- if(mdmModuleViewVo.getQueryFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())){
+ if (mdmModuleViewVo.getQueryFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())) {
mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getQueryFiled().get(i1).getName());
queryFiled.add(mdmModuleViewDetailEntityList.get(i));
}
@@ -1895,9 +1896,9 @@ public class MdmModuleServiceImpl extends BaseService i
}
break;
case "2":
- if(mdmModuleViewVo.getListFiled() != null && mdmModuleViewVo.getListFiled().size() > 0 ){
+ if (mdmModuleViewVo.getListFiled() != null && mdmModuleViewVo.getListFiled().size() > 0) {
for (int i1 = 0; i1 < mdmModuleViewVo.getListFiled().size(); i1++) {
- if(mdmModuleViewVo.getListFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())){
+ if (mdmModuleViewVo.getListFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())) {
mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getListFiled().get(i1).getName());
listFiled.add(mdmModuleViewDetailEntityList.get(i));
}
@@ -1905,9 +1906,9 @@ public class MdmModuleServiceImpl extends BaseService i
}
break;
case "3":
- if(mdmModuleViewVo.getAddFiled() != null && mdmModuleViewVo.getAddFiled().size() > 0 ){
+ if (mdmModuleViewVo.getAddFiled() != null && mdmModuleViewVo.getAddFiled().size() > 0) {
for (int i1 = 0; i1 < mdmModuleViewVo.getAddFiled().size(); i1++) {
- if(mdmModuleViewVo.getAddFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())){
+ if (mdmModuleViewVo.getAddFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())) {
mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getAddFiled().get(i1).getName());
addFiled.add(mdmModuleViewDetailEntityList.get(i));
}
@@ -1915,9 +1916,9 @@ public class MdmModuleServiceImpl extends BaseService i
}
break;
case "4":
- if(mdmModuleViewVo.getEditFiled() != null && mdmModuleViewVo.getEditFiled().size() > 0 ){
+ if (mdmModuleViewVo.getEditFiled() != null && mdmModuleViewVo.getEditFiled().size() > 0) {
for (int i1 = 0; i1 < mdmModuleViewVo.getEditFiled().size(); i1++) {
- if(mdmModuleViewVo.getEditFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())){
+ if (mdmModuleViewVo.getEditFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())) {
mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getEditFiled().get(i1).getName());
editFiled.add(mdmModuleViewDetailEntityList.get(i));
}
@@ -1925,9 +1926,9 @@ public class MdmModuleServiceImpl extends BaseService i
}
break;
case "5":
- if(mdmModuleViewVo.getShowFiled() != null && mdmModuleViewVo.getShowFiled().size() > 0 ){
+ if (mdmModuleViewVo.getShowFiled() != null && mdmModuleViewVo.getShowFiled().size() > 0) {
for (int i1 = 0; i1 < mdmModuleViewVo.getShowFiled().size(); i1++) {
- if(mdmModuleViewVo.getShowFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())){
+ if (mdmModuleViewVo.getShowFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())) {
mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getShowFiled().get(i1).getName());
showFiled.add(mdmModuleViewDetailEntityList.get(i));
}
@@ -1967,45 +1968,45 @@ public class MdmModuleServiceImpl extends BaseService i
List listFiled = new ArrayList<>();
if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() > 0) {
for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
- if("3".equals(mdmModuleDbEntityList.get(i).getDbType()) || "4".equals(mdmModuleDbEntityList.get(i).getDbType())){
+ if ("3".equals(mdmModuleDbEntityList.get(i).getDbType()) || "4".equals(mdmModuleDbEntityList.get(i).getDbType())) {
continue;
}
if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) {
- if("document_rule".equals(mdmModuleDbFiledsEntityList.get(i1).getEnName())){
+ if ("document_rule".equals(mdmModuleDbFiledsEntityList.get(i1).getEnName())) {
continue;
}
if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
//1、主表
- if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getAddType())){
+ if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getAddType())) {
addFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
}
- if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getUpdateType())){
+ if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getUpdateType())) {
editFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
}
- if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getShowType())){
+ if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getShowType())) {
showFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
}
- if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getQueryType())){
+ if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getQueryType())) {
queryFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
}
- if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getListType())){
+ if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getListType())) {
listFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
}
} else {
//2、明细
- if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getQueryType())){
+ if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getQueryType())) {
queryFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
}
- if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getAddType())){
+ if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getAddType())) {
addFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
}
- if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getUpdateType())){
+ if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getUpdateType())) {
editFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
}
- if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getShowType())){
+ if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getShowType())) {
showFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
}
}
@@ -2177,7 +2178,7 @@ public class MdmModuleServiceImpl extends BaseService i
SysMenuConfigEntity module = new SysMenuConfigEntity();
module.setFormId(mdmModuleEntity.getId());
List sysMenuConfigEntities = sysMenuConfigDao.queryBase(module);
- if(sysMenuConfigEntities != null && sysMenuConfigEntities.size() == 1){
+ if (sysMenuConfigEntities != null && sysMenuConfigEntities.size() == 1) {
module = sysMenuConfigEntities.get(0);
SysButtonConfigEntity buttonConfigEntity = new SysButtonConfigEntity();
buttonConfigEntity.setMenuId(module.getId());
@@ -2192,36 +2193,37 @@ public class MdmModuleServiceImpl extends BaseService i
sysButtonConfigDao.logicRemoveMultiCondition(buttonConfigEntity);
sysPopedomOperateDao.logicRemoveMultiCondition(sysPopedomOperateEntity);
//删除处理权限
- doMdmModuleButton(module,entity.getDbButtonFiled(),sysButtonConfigEntities,sysPopedomOperateEntities);
+ doMdmModuleButton(module, entity.getDbButtonFiled(), sysButtonConfigEntities, sysPopedomOperateEntities);
}
return BaseResult.getSuccessMessageEntity("修改显示按钮成功");
}
+
/**
+ * @param module 菜单
+ * @param mdmModuleViewButtonEntities 主数据按钮
+ * @param sysButtonConfigEntities 菜单按钮
+ * @param sysPopedomOperateEntities 按钮权限
+ * @return void
* @Author lvleigang
* @Description
* @Date 3:29 下午 2024/6/4
- * @param module 菜单
- * @param mdmModuleViewButtonEntities 主数据按钮
- * @param sysButtonConfigEntities 菜单按钮
- * @param sysPopedomOperateEntities 按钮权限
- * @return void
**/
- private void doMdmModuleButton(SysMenuConfigEntity module,List mdmModuleViewButtonEntities, List sysButtonConfigEntities, List sysPopedomOperateEntities) {
+ private void doMdmModuleButton(SysMenuConfigEntity module, List mdmModuleViewButtonEntities, List sysButtonConfigEntities, List sysPopedomOperateEntities) {
//循环设置的按钮,再循环菜单的按钮,如果有把原先的修改状态,如果没有新增
- if(mdmModuleViewButtonEntities != null && mdmModuleViewButtonEntities.size() > 0){
+ if (mdmModuleViewButtonEntities != null && mdmModuleViewButtonEntities.size() > 0) {
for (int i = 0; i < mdmModuleViewButtonEntities.size(); i++) {
boolean flag = false;
- if(sysButtonConfigEntities != null && sysButtonConfigEntities.size() > 0){
+ if (sysButtonConfigEntities != null && sysButtonConfigEntities.size() > 0) {
for (int i1 = 0; i1 < sysButtonConfigEntities.size(); i1++) {
- if(mdmModuleViewButtonEntities.get(i).getButtonValue().equals(sysButtonConfigEntities.get(i1).getCode())){
+ if (mdmModuleViewButtonEntities.get(i).getButtonValue().equals(sysButtonConfigEntities.get(i1).getCode())) {
flag = true;
sysButtonConfigEntities.get(i1).setSts("Y");
sysButtonConfigEntities.get(i1).setUpdate();
- sysButtonConfigEntities.get(i1).setSorts(i+1L);
+ sysButtonConfigEntities.get(i1).setSorts(i + 1L);
sysButtonConfigDao.update(sysButtonConfigEntities.get(i1));
- if(sysPopedomOperateEntities != null && sysPopedomOperateEntities.size() > 0){
+ if (sysPopedomOperateEntities != null && sysPopedomOperateEntities.size() > 0) {
for (int i2 = 0; i2 < sysPopedomOperateEntities.size(); i2++) {
- if(sysPopedomOperateEntities.get(i2).getOperate().equals(sysButtonConfigEntities.get(i1).getId())){
+ if (sysPopedomOperateEntities.get(i2).getOperate().equals(sysButtonConfigEntities.get(i1).getId())) {
sysPopedomOperateEntities.get(i2).setSts("Y");
sysPopedomOperateEntities.get(i2).setUpdate();
sysPopedomOperateDao.update(sysPopedomOperateEntities.get(i2));
@@ -2233,8 +2235,8 @@ public class MdmModuleServiceImpl extends BaseService i
}
}
//原先没有需要新增
- if(!flag){
- if("new".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())){
+ if (!flag) {
+ if ("new".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
SysButtonConfigEntity xz = new SysButtonConfigEntity();
xz.setCode("new");
xz.setNameCh("新建");
@@ -2244,11 +2246,11 @@ public class MdmModuleServiceImpl extends BaseService i
xz.setStyles("");
xz.setBtnFunction("new");
xz.setRemark("主数据新建按钮");
- xz.setSorts(i+1L);
+ xz.setSorts(i + 1L);
xz.setCreate();
sysButtonConfigDao.save(xz);
}
- if("resize".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())){
+ if ("resize".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
SysButtonConfigEntity cz = new SysButtonConfigEntity();
cz.setCode("resize");
@@ -2259,12 +2261,12 @@ public class MdmModuleServiceImpl extends BaseService i
cz.setStyles("");
cz.setBtnFunction("resize");
cz.setRemark("主数据重置按钮");
- cz.setSorts(i+1L);
+ cz.setSorts(i + 1L);
cz.setCreate();
sysButtonConfigDao.save(cz);
}
- if("search".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
+ if ("search".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
SysButtonConfigEntity cx = new SysButtonConfigEntity();
cx.setCode("search");
@@ -2275,11 +2277,11 @@ public class MdmModuleServiceImpl extends BaseService i
cx.setStyles("");
cx.setBtnFunction("search");
cx.setRemark("主数据查询按钮");
- cx.setSorts(i+1L);
+ cx.setSorts(i + 1L);
cx.setCreate();
sysButtonConfigDao.save(cx);
}
- if("edit".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
+ if ("edit".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
SysButtonConfigEntity xg = new SysButtonConfigEntity();
xg.setCode("edit");
@@ -2290,11 +2292,11 @@ public class MdmModuleServiceImpl extends BaseService i
xg.setStyles("");
xg.setBtnFunction("edit");
xg.setRemark("主数据修改按钮");
- xg.setSorts(i+1L);
+ xg.setSorts(i + 1L);
xg.setCreate();
sysButtonConfigDao.save(xg);
}
- if("dele".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
+ if ("dele".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
SysButtonConfigEntity sc = new SysButtonConfigEntity();
sc.setCode("dele");
@@ -2305,11 +2307,11 @@ public class MdmModuleServiceImpl extends BaseService i
sc.setStyles("");
sc.setBtnFunction("dele");
sc.setRemark("主数据删除按钮");
- sc.setSorts(i+1L);
+ sc.setSorts(i + 1L);
sc.setCreate();
sysButtonConfigDao.save(sc);
}
- if("view".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
+ if ("view".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
SysButtonConfigEntity ck = new SysButtonConfigEntity();
ck.setCode("view");
@@ -2320,11 +2322,11 @@ public class MdmModuleServiceImpl extends BaseService i
ck.setStyles("");
ck.setBtnFunction("view");
ck.setRemark("主数据查看按钮");
- ck.setSorts(i+1L);
+ ck.setSorts(i + 1L);
ck.setCreate();
sysButtonConfigDao.save(ck);
}
- if("send".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
+ if ("send".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
SysButtonConfigEntity xf = new SysButtonConfigEntity();
xf.setCode("send");
xf.setNameCh("下发");
@@ -2334,7 +2336,7 @@ public class MdmModuleServiceImpl extends BaseService i
xf.setStyles("");
xf.setBtnFunction("send");
xf.setRemark("主数据下发按钮");
- xf.setSorts(i+1L);
+ xf.setSorts(i + 1L);
xf.setCreate();
sysButtonConfigDao.save(xf);
}
@@ -2344,6 +2346,7 @@ public class MdmModuleServiceImpl extends BaseService i
}
}
}
+
/**
* @param object
* @return com.hzya.frame.web.entity.JsonResultEntity
@@ -2464,17 +2467,17 @@ public class MdmModuleServiceImpl extends BaseService i
return BaseResult.getFailureMessageEntity("系统错误");
}
List list = mdmModuleDistributeDao.queryBase(entity);
- if(list != null && list.size() > 0){
+ if (list != null && list.size() > 0) {
MdmModuleDistributeDetailEntity mdmModuleDistributeDetailEntity = new MdmModuleDistributeDetailEntity();
mdmModuleDistributeDetailEntity.setMdmId(entity.getMdmId());
mdmModuleDistributeDetailEntity.setSts("Y");
List listDetail = mdmModuleDistributeDetailDao.queryBase(mdmModuleDistributeDetailEntity);
- if(listDetail != null && listDetail.size() > 0){
+ if (listDetail != null && listDetail.size() > 0) {
for (int i = 0; i < list.size(); i++) {
List mdmModuleDistributeDetailEntities = new ArrayList<>();
for (int i1 = 0; i1 < listDetail.size(); i1++) {
- if(listDetail.get(i1).getDistributeId().equals(list.get(i).getId())){
- mdmModuleDistributeDetailEntities.add(listDetail.get(i1) );
+ if (listDetail.get(i1).getDistributeId().equals(list.get(i).getId())) {
+ mdmModuleDistributeDetailEntities.add(listDetail.get(i1));
}
}
list.get(i).setMdmModuleDistributeDetailEntities(mdmModuleDistributeDetailEntities);
@@ -2623,21 +2626,21 @@ public class MdmModuleServiceImpl extends BaseService i
return BaseResult.getFailureMessageEntity("系统错误");
}
MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
- if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){
+ if (mdmModuleEntity == null || mdmModuleEntity.getId() == null) {
return BaseResult.getFailureMessageEntity("系统错误");
}
MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
mdmModuleDbEntity.setSts("Y");
List mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
- if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0 ){
+ if (mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0) {
for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
- if("1".equals(mdmModuleDbEntities.get(i).getDbType())){
- entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_option_log");
+ if ("1".equals(mdmModuleDbEntities.get(i).getDbType())) {
+ entity.setTableName(mdmModuleDbEntities.get(i).getDbName() + "_option_log");
break;
}
}
- }else {
+ } else {
return BaseResult.getFailureMessageEntity("请先设置数据源");
}
PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
@@ -2683,16 +2686,29 @@ public class MdmModuleServiceImpl extends BaseService i
}
PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
List list = mdmModuleSendLogDao.queryByLike(entity);
+ if (list != null && list.size() > 0) {
+ for (int i = 0; i < list.size(); i++) {
+ if (list.get(i).getOptionType() != null) {
+ if ("1".equals(list.get(i).getOptionType())) {
+ list.get(i).setOptionType("新增");
+ } else if ("2".equals(list.get(i).getOptionType())) {
+ list.get(i).setOptionType("修改");
+ } else if ("3".equals(list.get(i).getOptionType())) {
+ list.get(i).setOptionType("删除");
+ }
+ }
+ }
+ }
PageInfo pageInfo = new PageInfo(list);
return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
}
/**
- * @Author lvleigang
- * @Description 主数据-数据源-服务获取(只获取主表)
- * @Date 11:43 上午 2024/6/11
* @param object
* @return com.hzya.frame.web.entity.JsonResultEntity
+ * @Author lvleigang
+ * @Description 主数据-数据源-服务获取(只获取主表)
+ * @Date 11:43 上午 2024/6/11
**/
@Override
public JsonResultEntity queryMdmService(JSONObject object) {
@@ -2706,11 +2722,11 @@ public class MdmModuleServiceImpl extends BaseService i
/**
- * @Author lvleigang
- * @Description 主数据-数据源-服务字段获取
- * @Date 11:43 上午 2024/6/11
* @param object
* @return com.hzya.frame.web.entity.JsonResultEntity
+ * @Author lvleigang
+ * @Description 主数据-数据源-服务字段获取
+ * @Date 11:43 上午 2024/6/11
**/
@Override
public JsonResultEntity queryMdmServiceField(JSONObject object) {
@@ -2729,9 +2745,9 @@ public class MdmModuleServiceImpl extends BaseService i
mdmModuleDbFiledsEntity.setMdmId(entity.getMdmId());
List mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
List list = new ArrayList<>();
- if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0){
+ if (mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0) {
for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
- if(entity.getDbId().equals(mdmModuleDbEntities.get(i).getDbId()) && "1".equals(mdmModuleDbEntities.get(i).getViewType())){
+ if (entity.getDbId().equals(mdmModuleDbEntities.get(i).getDbId()) && "1".equals(mdmModuleDbEntities.get(i).getViewType())) {
list.add(mdmModuleDbEntities.get(i));
}
}
@@ -2740,11 +2756,11 @@ public class MdmModuleServiceImpl extends BaseService i
}
/**
- * @Author lvleigang
- * @Description 主数据-分发-只获取主表
- * @Date 11:43 上午 2024/6/11
* @param object
* @return com.hzya.frame.web.entity.JsonResultEntity
+ * @Author lvleigang
+ * @Description 主数据-分发-只获取主表
+ * @Date 11:43 上午 2024/6/11
**/
@Override
public JsonResultEntity queryMdmMainDB(JSONObject object) {
@@ -2760,9 +2776,9 @@ public class MdmModuleServiceImpl extends BaseService i
mdmModuleDbEntity.setMdmId(entity.getMdmId());
List mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
List list = new ArrayList<>();
- if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0){
+ if (mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0) {
for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
- if("1".equals(mdmModuleDbEntities.get(i).getDbType())){
+ if ("1".equals(mdmModuleDbEntities.get(i).getDbType())) {
list.add(mdmModuleDbEntities.get(i));
}
}
@@ -2771,11 +2787,11 @@ public class MdmModuleServiceImpl extends BaseService i
}
/**
- * @Author lvleigang
- * @Description 主数据-数据源-只获取主表字段
- * @Date 11:43 上午 2024/6/11
* @param object
* @return com.hzya.frame.web.entity.JsonResultEntity
+ * @Author lvleigang
+ * @Description 主数据-数据源-只获取主表字段
+ * @Date 11:43 上午 2024/6/11
**/
@Override
public JsonResultEntity queryMdmMainDBField(JSONObject object) {
@@ -2797,12 +2813,12 @@ public class MdmModuleServiceImpl extends BaseService i
List mdmModuleDbFiledsEntities = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
List list = new ArrayList<>();
- if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0){
+ if (mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0) {
for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
- if("1".equals(mdmModuleDbEntities.get(i).getDbType())){
- if(mdmModuleDbFiledsEntities != null && mdmModuleDbFiledsEntities.size() > 0){
+ if ("1".equals(mdmModuleDbEntities.get(i).getDbType())) {
+ if (mdmModuleDbFiledsEntities != null && mdmModuleDbFiledsEntities.size() > 0) {
for (int i1 = 0; i1 < mdmModuleDbFiledsEntities.size(); i1++) {
- if(mdmModuleDbEntities.get(i).getId().equals(mdmModuleDbFiledsEntities.get(i1).getDbId()) && "1".equals(mdmModuleDbFiledsEntities.get(i1).getViewType())){
+ if (mdmModuleDbEntities.get(i).getId().equals(mdmModuleDbFiledsEntities.get(i1).getDbId()) && "1".equals(mdmModuleDbFiledsEntities.get(i1).getViewType())) {
list.add(mdmModuleDbFiledsEntities.get(i1));
}
}
From a1b46b6dd51d61d29c1be9d3ee03344a0531e4f7 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Fri, 9 Aug 2024 13:37:29 +0800
Subject: [PATCH 19/26] =?UTF-8?q?=E6=BE=B3=E6=98=9F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../u8c/ax/service/impl/AxServiceImpl.java | 1533 +++++++++--------
1 file changed, 785 insertions(+), 748 deletions(-)
diff --git a/service/src/main/java/com/hzya/frame/u8c/ax/service/impl/AxServiceImpl.java b/service/src/main/java/com/hzya/frame/u8c/ax/service/impl/AxServiceImpl.java
index 866b91a3..cf4aa9bc 100644
--- a/service/src/main/java/com/hzya/frame/u8c/ax/service/impl/AxServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/u8c/ax/service/impl/AxServiceImpl.java
@@ -1,6 +1,7 @@
package com.hzya.frame.u8c.ax.service.impl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.basedao.service.impl.BaseService;
import com.hzya.frame.u8c.ax.dao.IAxDao;
@@ -33,767 +34,803 @@ import java.util.List;
@Service("axServiceImpl")
public class AxServiceImpl extends BaseService implements IAxService {
private IAxDao axDao;
+
@Autowired
- public void setAxDao(IAxDao dao) {
- this.axDao = dao;
- this.dao = dao;
- }
- @Value("${zt.url}")
- private String voucherUrl;
- private final String publicKey = "ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj";
- private final String secretKey = "fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=";
- private final String appId = "800016";
- private final String pzApiCodexz = "8000160014";//凭证新增
- private final String pzApiCodexg = "8000160031";//凭证修改
- private final String pzApiCodesc = "8000160033";//凭证删除
- private final String pzApiCodezf = "8000160032";//凭证作废
+ public void setAxDao(IAxDao dao) {
+ this.axDao = dao;
+ this.dao = dao;
+ }
- private final String ryApiCodexz = "8000160029";//人员对照新增
- private final String ryApiCodexg = "8000160029";//人员对照修改
- private final String ryApiCodesc = "8000160030";//人员对照删除
+ @Value("${zt.url}")
+ private String voucherUrl;
+ private final String publicKey = "ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj";
+ private final String secretKey = "fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=";
+ private final String appId = "800016";
+ private final String pzApiCodexz = "8000160014";//凭证新增
+ private final String pzApiCodexg = "8000160031";//凭证修改
+ private final String pzApiCodesc = "8000160033";//凭证删除
+ private final String pzApiCodezf = "8000160032";//凭证作废
- private final String bmApiCodexz = "8000160015";//部门档案新增
- private final String bmApiCodexg = "8000160016";//部门档案修改
- private final String bmApiCodesc = "8000160017";//部门档案删除
+ private final String ryApiCodexz = "8000160029";//人员对照新增
+ private final String ryApiCodexg = "8000160029";//人员对照修改
+ private final String ryApiCodesc = "8000160030";//人员对照删除
- private final String chApiCodexz = "8000160025";//存货对照新增
- private final String chApiCodexg = "8000160026";//存货对照修改
- private final String chApiCodesc = "8000160027";//存货对照删除
+ private final String bmApiCodexz = "8000160015";//部门档案新增
+ private final String bmApiCodexg = "8000160016";//部门档案修改
+ private final String bmApiCodesc = "8000160017";//部门档案删除
- private final String ksApiCodexz = "8000160018";//客商辅助核算新增
- private final String ksApiCodexg = "8000160019";//客商辅助核算修改
- private final String ksApiCodesc = "8000160020";//客商辅助核算删除
+ private final String chApiCodexz = "8000160025";//存货对照新增
+ private final String chApiCodexg = "8000160026";//存货对照修改
+ private final String chApiCodesc = "8000160027";//存货对照删除
- private final String slApiCodexz = "8000160014";//税率新增
- private final String slApiCodexg = "8000160014";//税率修改
- private final String slApiCodesc = "8000160014";//税率删除
+ private final String ksApiCodexz = "8000160018";//客商辅助核算新增
+ private final String ksApiCodexg = "8000160019";//客商辅助核算修改
+ private final String ksApiCodesc = "8000160020";//客商辅助核算删除
- private final String xmApiCodexz = "8000160021";//项目辅助核算新增
- private final String xmApiCodexg = "8000160022";//项目辅助核算修改
- private final String xmApiCodesc = "8000160023";//项目辅助核算删除
+ private final String slApiCodexz = "8000160014";//税率新增
+ private final String slApiCodexg = "8000160014";//税率修改
+ private final String slApiCodesc = "8000160014";//税率删除
- private final String yhlbApiCodexz = "8000160014";//银行类别新增
- private final String yhlbApiCodexg = "8000160014";//银行类别修改
- private final String yhlbApiCodesc = "8000160014";//银行类别删除
+ private final String xmApiCodexz = "8000160021";//项目辅助核算新增
+ private final String xmApiCodexg = "8000160022";//项目辅助核算修改
+ private final String xmApiCodesc = "8000160023";//项目辅助核算删除
- private final String yhzhApiCodexz = "8000160014";//银行账户新增
- private final String yhzhApiCodexg = "8000160014";//银行账户修改
- private final String yhzhApiCodesc = "8000160014";//银行账户删除
+ private final String yhlbApiCodexz = "8000160014";//银行类别新增
+ private final String yhlbApiCodexg = "8000160014";//银行类别修改
+ private final String yhlbApiCodesc = "8000160014";//银行类别删除
- private final String zcApiCodexz = "8000160014";//资产类别新增
- private final String zcApiCodexg = "8000160014";//资产类别修改
- private final String zcApiCodesc = "8000160014";//资产类别删除
+ private final String yhzhApiCodexz = "8000160014";//银行账户新增
+ private final String yhzhApiCodexg = "8000160014";//银行账户修改
+ private final String yhzhApiCodesc = "8000160014";//银行账户删除
- private final Object lock = new Object();
+ private final String zcApiCodexz = "8000160014";//资产类别新增
+ private final String zcApiCodexg = "8000160014";//资产类别修改
+ private final String zcApiCodesc = "8000160014";//资产类别删除
- /**
- * @Author lvleigang
- * @Description 凭证新增
- * @Date 3:42 下午 2024/4/24
- * @param object
- * @return com.hzya.frame.web.entity.JsonResultEntity
- **/
- @Override
- public Object thirdInterfaceVoucherInsert(JSONObject object) {
- JSONObject jsonObject = object.getJSONObject("jsonStr");
- if(jsonObject == null ){
- return BaseResult.getFailureMessageEntity("数据为空,请先传递数据");
- }
- if(!checkStr(jsonObject.getString("voucherType"))){
- return BaseResult.getFailureMessageEntity("voucherType为空");
- }
- if(!checkStr(jsonObject.getString("usercode"))){
- return BaseResult.getFailureMessageEntity("usercode为空");
- }
- if(!checkStr(jsonObject.getString("password"))){
- return BaseResult.getFailureMessageEntity("password为空");
- }
- if(!checkStr(jsonObject.getString("trantype"))){
- return BaseResult.getFailureMessageEntity("trantype为空");
- }
- if(!checkStr(jsonObject.getString("system"))){
- return BaseResult.getFailureMessageEntity("system为空");
- }
- if(!checkStr(jsonObject.getString("data"))){
- return BaseResult.getFailureMessageEntity("data为空");
- }
- String bodys = jsonObject.getString("data");
- List fzhs = Arrays.asList(new String[]{"1", "2", "6", "73", "D01" , "jobass" , "93" , "96", "22"});
- switch (jsonObject.getString("voucherType")){
- case "add"://新增
- VoucherRoot entity1 = getData("data", jsonObject, VoucherRoot.class);
- if(entity1 == null || entity1.getVoucher() == null || entity1.getVoucher().size() == 0){
- return BaseResult.getFailureMessageEntity("data为空");
+ private final Object lock = new Object();
+
+ /**
+ * @param object
+ * @return com.hzya.frame.web.entity.JsonResultEntity
+ * @Author lvleigang
+ * @Description 凭证新增
+ * @Date 3:42 下午 2024/4/24
+ **/
+ @Override
+ public Object thirdInterfaceVoucherInsert(JSONObject object) {
+ JSONObject jsonObject = object.getJSONObject("jsonStr");
+ if (jsonObject == null) {
+ return BaseResult.getFailureMessageEntity("数据为空,请先传递数据");
+ }
+ if (!checkStr(jsonObject.getString("voucherType"))) {
+ return BaseResult.getFailureMessageEntity("voucherType为空");
+ }
+ if (!checkStr(jsonObject.getString("usercode"))) {
+ return BaseResult.getFailureMessageEntity("usercode为空");
+ }
+ if (!checkStr(jsonObject.getString("password"))) {
+ return BaseResult.getFailureMessageEntity("password为空");
+ }
+ if (!checkStr(jsonObject.getString("trantype"))) {
+ return BaseResult.getFailureMessageEntity("trantype为空");
+ }
+ if (!checkStr(jsonObject.getString("system"))) {
+ return BaseResult.getFailureMessageEntity("system为空");
+ }
+ if (!checkStr(jsonObject.getString("data"))) {
+ return BaseResult.getFailureMessageEntity("data为空");
+ }
+ String bodys = jsonObject.getString("data");
+ List fzhs = Arrays.asList(new String[]{"1", "2", "6", "73", "D01", "jobass", "93", "96", "22"});
+ switch (jsonObject.getString("voucherType")) {
+ case "add"://新增
+ VoucherRoot entity1 = getData("data", jsonObject, VoucherRoot.class);
+ if (entity1 == null || entity1.getVoucher() == null || entity1.getVoucher().size() == 0) {
+ return BaseResult.getFailureMessageEntity("data为空");
+ }
+ for (int i = 0; i < entity1.getVoucher().size(); i++) {
+ Voucher voucher = entity1.getVoucher().get(i);
+ if (voucher.getDetails() != null && voucher.getDetails().size() > 0) {
+ for (int a = 0; a < voucher.getDetails().size(); a++) {
+ VoucherDetails voucherDetails = voucher.getDetails().get(a);
+ if (voucherDetails.getAss() != null && voucherDetails.getAss().size() > 0) {
+ for (int b = 0; b < voucherDetails.getAss().size(); b++) {
+ Ass ass = voucherDetails.getAss().get(b);
+ if (ass.getChecktypecode() != null && !"".equals(ass.getChecktypecode())) {
+ //存在需要转换的
+ if (fzhs.contains(ass.getChecktypecode())) {
+ ArchivesEntity archivesEntity = new ArchivesEntity();
+ archivesEntity.setArchivesType(ass.getChecktypecode());
+ archivesEntity.setLeftCode(ass.getCheckvaluecode());
+ archivesEntity.setLeftOrg(voucher.getPk_corp());
+
+ List archivesEntities = axDao.queryArchivesData(archivesEntity);
+ if (archivesEntities != null && archivesEntities.size() > 0) {
+ ass.setCheckvaluecode(archivesEntities.get(0).getRightCode());
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ bodys = JSON.toJSONString(entity1);
+ break;
+ case "update"://修改
+ VoucherRoot entity = getData("data", jsonObject, VoucherRoot.class);
+ if (entity == null || entity.getVoucher() == null || entity.getVoucher().size() == 0) {
+ return BaseResult.getFailureMessageEntity("data为空");
+ }
+ for (int i = 0; i < entity.getVoucher().size(); i++) {
+ Voucher voucher = entity.getVoucher().get(i);
+ if (voucher.getDetails() != null && voucher.getDetails().size() > 0) {
+ for (int a = 0; a < voucher.getDetails().size(); a++) {
+ VoucherDetails voucherDetails = voucher.getDetails().get(a);
+ if (voucherDetails.getAss() != null && voucherDetails.getAss().size() > 0) {
+ for (int b = 0; b < voucherDetails.getAss().size(); b++) {
+ Ass ass = voucherDetails.getAss().get(b);
+ if (ass.getChecktypecode() != null && !"".equals(ass.getChecktypecode())) {
+ //存在需要转换的
+ if (fzhs.contains(ass.getChecktypecode())) {
+ ArchivesEntity archivesEntity = new ArchivesEntity();
+ archivesEntity.setArchivesType(ass.getChecktypecode());
+ archivesEntity.setLeftCode(ass.getCheckvaluecode());
+ archivesEntity.setLeftOrg(voucher.getPk_corp());
+ List archivesEntities = axDao.queryArchivesData(archivesEntity);
+ if (archivesEntities != null && archivesEntities.size() > 0) {
+ ass.setCheckvaluecode(archivesEntities.get(0).getRightCode());
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ bodys = JSON.toJSONString(entity);
+ break;
+ case "delete"://删除
+ break;
+ case "cancellation"://作废
+ break;
+ default:
+ break;
+ }
+ HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
+ // HttpClient
+ CloseableHttpClient closeableHttpClient = httpClientBuilder.disableCookieManagement().build();
+ HttpPost post = new HttpPost(voucherUrl);
+ CloseableHttpResponse response = null;
+
+ RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(60000).build();
+ post.setConfig(requestConfig);//设置请求参数【超时时间】
+ post.setHeader("usercode", jsonObject.getString("usercode"));
+ post.setHeader("password", jsonObject.getString("password"));
+ post.setHeader("trantype", jsonObject.getString("trantype"));
+ post.setHeader("system", jsonObject.getString("system"));
+ post.setHeader("publicKey", publicKey);
+ post.setHeader("secretKey", secretKey);
+ post.setHeader("appId", appId);
+ post.setHeader("needStackTrace", jsonObject.getString("needStackTrace"));
+ switch (jsonObject.getString("voucherType")) {
+ case "add"://新增
+ post.setHeader("apiCode", pzApiCodexz);
+ break;
+ case "update"://修改
+ post.setHeader("apiCode", pzApiCodexg);
+ break;
+ case "delete"://删除
+ post.setHeader("apiCode", pzApiCodesc);
+ break;
+ case "cancellation"://作废
+ post.setHeader("apiCode", pzApiCodezf);
+ break;
+ default:
+ break;
+ }
+ StringBuilder body = new StringBuilder();
+ try {
+ if (bodys != null && !"".equals(bodys)) {
+ ByteArrayEntity byteArrayEntity = new ByteArrayEntity(bodys.getBytes("UTF-8"));
+ byteArrayEntity.setContentType("application/json");
+ post.setEntity(byteArrayEntity);
+ }
+ response = closeableHttpClient.execute(post);
+ HttpEntity httpEntity = response.getEntity();
+ synchronized (lock) {
+ body.append(EntityUtils.toString(httpEntity));
+ }
+ logger.info("返回结果:" + body);
+ JsonResultEntity resultEntity = JSON.parseObject(body.toString(), JsonResultEntity.class);
+ return resultEntity;
+ } catch (Exception e) {
+ logger.error("请求错误:" + e.getMessage());
+ body.append(e.getMessage());
+ return BaseResult.getFailureMessageEntity("转发失败", body);
+ } finally {
+ try {
+ // 关闭响应对象
+ if (response != null) {
+ response.close();
+ }
+ // 关闭响应对象
+ if (closeableHttpClient != null) {
+ closeableHttpClient.close();
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ /**
+ * @param object
+ * @return com.hzya.frame.web.entity.JsonResultEntity
+ * @Author lvleigang
+ * @Description 档案新增
+ * @Date 3:42 下午 2024/4/24
+ **/
+ @Override
+ public Object thirdInterfaceArchivesInsert(JSONObject object) {
+ JSONObject jsonObject = object.getJSONObject("jsonStr");
+ if (jsonObject == null) {
+ return BaseResult.getFailureMessageEntity("数据为空,请先传递数据");
+ }
+ if (!checkStr(jsonObject.getString("archivesType"))) {
+ return BaseResult.getFailureMessageEntity("档案类型为空");
+ }
+ if (!checkStr(jsonObject.getString("usercode"))) {
+ return BaseResult.getFailureMessageEntity("usercode为空");
+ }
+ if (!checkStr(jsonObject.getString("password"))) {
+ return BaseResult.getFailureMessageEntity("password为空");
+ }
+ if (!checkStr(jsonObject.getString("trantype"))) {
+ return BaseResult.getFailureMessageEntity("trantype为空");
+ }
+ if (!checkStr(jsonObject.getString("system"))) {
+ return BaseResult.getFailureMessageEntity("system为空");
+ }
+ if (!checkStr(jsonObject.getString("data"))) {
+ return BaseResult.getFailureMessageEntity("data为空");
+ }
+ List fzhs = Arrays.asList(new String[]{"1", "2", "6", "73", "D01", "jobass", "93", "96", "22"});
+ if (!fzhs.contains(jsonObject.getString("archivesType"))) {
+ return BaseResult.getFailureMessageEntity("档案类型错误,请联系管理员");
+ }
+ HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
+ // HttpClient
+ CloseableHttpClient closeableHttpClient = httpClientBuilder.disableCookieManagement().build();
+ HttpPost post = new HttpPost(voucherUrl);
+ RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(60000).build();
+ post.setConfig(requestConfig);//设置请求参数【超时时间】
+ post.setHeader("usercode", jsonObject.getString("usercode"));
+ post.setHeader("password", jsonObject.getString("password"));
+ post.setHeader("trantype", jsonObject.getString("trantype"));
+ post.setHeader("system", jsonObject.getString("system"));
+ post.setHeader("publicKey", publicKey);
+ post.setHeader("secretKey", secretKey);
+ post.setHeader("appId", appId);
+ CloseableHttpResponse response = null;
+ switch (jsonObject.getString("archivesType")) {
+ case "1"://人员对照
+ post.setHeader("apiCode", ryApiCodexz);
+ break;
+ case "2"://部门档案
+ post.setHeader("apiCode", bmApiCodexz);
+ break;
+ case "6"://存货对照
+ post.setHeader("apiCode", chApiCodexz);
+ break;
+ case "73"://客商辅助核算
+ post.setHeader("apiCode", ksApiCodexz);
+ break;
+ case "D01"://税率
+ post.setHeader("apiCode", slApiCodexz);
+ break;
+ case "jobass"://项目辅助核算
+ post.setHeader("apiCode", xmApiCodexz);
+ break;
+ case "93"://银行类别
+ post.setHeader("apiCode", yhlbApiCodexz);
+ break;
+ case "96"://银行账户
+ post.setHeader("apiCode", yhzhApiCodexz);
+ break;
+ case "22"://资产类别
+ post.setHeader("apiCode", zcApiCodexz);
+ break;
+ default:
+ break;
+ }
+ StringBuilder body = new StringBuilder();
+ try {
+ String senddata = jsonObject.getString("data");
+ if ("1".equals(jsonObject.getString("archivesType"))) {
+ JSONObject sendJson = JSONObject.parseObject(senddata);
+ JSONObject sendObject = new JSONObject();
+
+ if (sendJson != null) {
+ JSONArray psn = sendJson.getJSONArray("psn");
+ JSONArray sendpsn = new JSONArray();
+ if (psn != null && psn.size() > 0) {
+ for (int i = 0; i < psn.size(); i++) {
+ JSONObject person = psn.getJSONObject(i);
+ JSONObject parentvo = person.getJSONObject("parentvo");
+ JSONObject psnmanvo = parentvo.getJSONObject("psnmanvo");
+
+ ArchivesEntity archivesEntity = new ArchivesEntity();
+ archivesEntity.setArchivesType("2");
+ archivesEntity.setLeftCode(psnmanvo.getString("pk_deptdoc"));
+ archivesEntity.setLeftOrg(parentvo.getString("currentcorp"));
+ List archivesEntities = axDao.queryArchivesData(archivesEntity);
+ if (archivesEntities != null && archivesEntities.size() > 0) {
+ psnmanvo.put("pk_deptdoc",archivesEntities.get(0).getRightCode());
+ }
+ parentvo.put("psnmanvo",psnmanvo);
+ person.put("parentvo",parentvo);
+ sendpsn.add(person);
+ }
+ }
+ sendObject.put("psn",sendpsn);
}
- for (int i = 0; i < entity1.getVoucher().size(); i++) {
- Voucher voucher = entity1.getVoucher().get(i);
- if(voucher.getDetails() != null && voucher.getDetails().size() > 0){
- for (int a = 0; a < voucher.getDetails().size(); a++) {
- VoucherDetails voucherDetails = voucher.getDetails().get(a);
- if(voucherDetails.getAss() != null && voucherDetails.getAss().size() > 0){
- for (int b = 0; b < voucherDetails.getAss().size(); b++) {
- Ass ass = voucherDetails.getAss().get(b);
- if(ass.getChecktypecode() != null && !"".equals(ass.getChecktypecode())){
- //存在需要转换的
- if(fzhs.contains(ass.getChecktypecode())){
- ArchivesEntity archivesEntity = new ArchivesEntity();
- archivesEntity.setArchivesType(ass.getChecktypecode());
- archivesEntity.setLeftCode(ass.getCheckvaluecode());
- archivesEntity.setLeftOrg(voucher.getPk_corp());
+ senddata = sendObject.toJSONString();
+ }
+ ByteArrayEntity byteArrayEntity = new ByteArrayEntity(senddata.getBytes("UTF-8"));
+ byteArrayEntity.setContentType("application/json");
+ post.setEntity(byteArrayEntity);
+ response = closeableHttpClient.execute(post);
+ HttpEntity httpEntity = response.getEntity();
+ synchronized (lock) {
+ body.append(EntityUtils.toString(httpEntity));
+ }
+ logger.info("返回结果:" + body);
+ JsonResultEntity resultEntity = JSON.parseObject(body.toString(), JsonResultEntity.class);
+ return resultEntity;
+ //todo 暂时不保存
+ //JsonResultEntity resultEntity = JSON.parseObject(body.toString(),JsonResultEntity.class);
+ //if(resultEntity.isFlag() && "200".equals(resultEntity.getStatus())){
+ // if(JSONUtil.isTypeJSON(resultEntity.getAttribute().toString())){
+ // JSONObject attribute = JSONObject.parseObject(resultEntity.getAttribute().toString());
+ // if("success".equals(attribute.getString("status"))){
+ // if(attribute.getString("data") == null || "".equals(attribute.getString("data")) ){
+ // return resultEntity;
+ // }
+ // JSONArray jsonArray = JSONArray.parseArray(attribute.getString("data"));
+ // if(jsonArray == null || jsonArray.size() == 0 ){
+ // return resultEntity;
+ // }
+ // //解析具体数据
+ // switch (jsonObject.getString("archivesType")){
+ // case "1"://人员对照
+ //
+ //
+ // break;
+ // case "2"://部门档案
+ // //[{"pk_corp":"1001","unitcode":"01","unitname":"临安奥星电子股份有限公司","createdate":"2024-04-24","deptattr":"1","deptname":"DEV测试一级部门","deptcode":"99","pk_deptdoc":"1001F1100000000067BR"}]
+ // for (int i = 0; i < jsonArray.size(); i++) {
+ // JSONObject object1 = jsonArray.getJSONObject(i);
+ // ArchivesEntity archivesEntity = new ArchivesEntity();
+ // archivesEntity.setArchivesType(jsonObject.getString("archivesType"));
+ // archivesEntity.setCreate();
+ // archivesEntity.setLeftCode(object1.getString("unitcode"));//左
+ // archivesEntity.setLeftName(object1.getString("unitname"));//左
+ // archivesEntity.setRightId(object1.getString("pk_deptdoc"));//右
+ // archivesEntity.setRightCode(object1.getString("unitcode"));//右
+ // archivesEntity.setRightName(object1.getString("unitname"));//右
+ // axDao.saveArchivesByType(archivesEntity);
+ // }
+ // break;
+ // case "6"://存货对照
+ // for (int i = 0; i < jsonArray.size(); i++) {
+ // JSONObject object1 = jsonArray.getJSONObject(i);
+ // ArchivesEntity archivesEntity = new ArchivesEntity();
+ // archivesEntity.setArchivesType(jsonObject.getString("archivesType"));
+ // archivesEntity.setCreate();
+ // archivesEntity.setLeftCode(object1.getString("invclasscode"));//左
+ // archivesEntity.setLeftName(object1.getString("invclassname"));//左
+ // archivesEntity.setRightId(object1.getString("pk_invcl"));//右
+ // archivesEntity.setRightCode(object1.getString("invclasscode"));//右
+ // archivesEntity.setRightName(object1.getString("invclassname"));//右
+ // axDao.saveArchivesByType(archivesEntity);
+ // }
+ // break;
+ // case "73"://客商辅助核算
+ // break;
+ // case "D01"://税率
+ // break;
+ // case "jobass"://项目辅助核算
+ // break;
+ // case "93"://银行类别
+ // break;
+ // case "96"://银行账户
+ // break;
+ // case "22"://资产类别
+ // break;
+ // default:
+ // break;
+ // }
+ // return resultEntity;
+ // }else {
+ // return resultEntity;
+ // }
+ // }else {
+ // return resultEntity;
+ // }
+ //}else {
+ // //解析返回
+ // return resultEntity;
+ //}
+ } catch (Exception e) {
+ logger.error("请求错误:" + e.getMessage());
+ body.append(e.getMessage());
+ return BaseResult.getFailureMessageEntity("转发失败", body);
+ } finally {
+ try {
+ // 关闭响应对象
+ if (response != null) {
+ response.close();
+ }
+ // 关闭响应对象
+ if (closeableHttpClient != null) {
+ closeableHttpClient.close();
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
- List archivesEntities = axDao.queryArchivesData(archivesEntity);
- if(archivesEntities != null && archivesEntities.size() > 0){
- ass.setCheckvaluecode(archivesEntities.get(0).getRightCode());
- }
- }
- }
- }
- }
- }
- }
- }
- bodys = JSON.toJSONString(entity1);
- break;
- case "update"://修改
- VoucherRoot entity = getData("data", jsonObject, VoucherRoot.class);
- if(entity == null || entity.getVoucher() == null || entity.getVoucher().size() == 0){
- return BaseResult.getFailureMessageEntity("data为空");
- }
- for (int i = 0; i < entity.getVoucher().size(); i++) {
- Voucher voucher = entity.getVoucher().get(i);
- if(voucher.getDetails() != null && voucher.getDetails().size() > 0){
- for (int a = 0; a < voucher.getDetails().size(); a++) {
- VoucherDetails voucherDetails = voucher.getDetails().get(a);
- if(voucherDetails.getAss() != null && voucherDetails.getAss().size() > 0){
- for (int b = 0; b < voucherDetails.getAss().size(); b++) {
- Ass ass = voucherDetails.getAss().get(b);
- if(ass.getChecktypecode() != null && !"".equals(ass.getChecktypecode())){
- //存在需要转换的
- if(fzhs.contains(ass.getChecktypecode())){
- ArchivesEntity archivesEntity = new ArchivesEntity();
- archivesEntity.setArchivesType(ass.getChecktypecode());
- archivesEntity.setLeftCode(ass.getCheckvaluecode());
- archivesEntity.setLeftOrg(voucher.getPk_corp());
- List archivesEntities = axDao.queryArchivesData(archivesEntity);
- if(archivesEntities != null && archivesEntities.size() > 0){
- ass.setCheckvaluecode(archivesEntities.get(0).getRightCode());
- }
- }
- }
- }
- }
- }
- }
- }
- bodys = JSON.toJSONString(entity);
- break;
- case "delete"://删除
- break;
- case "cancellation"://作废
- break;
- default:
- break;
- }
- HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
- // HttpClient
- CloseableHttpClient closeableHttpClient = httpClientBuilder.disableCookieManagement().build();
- HttpPost post = new HttpPost(voucherUrl);
- CloseableHttpResponse response = null;
+ /**
+ * @param object
+ * @return com.hzya.frame.web.entity.JsonResultEntity
+ * @Author lvleigang
+ * @Description 档案修改
+ * @Date 3:42 下午 2024/4/24
+ **/
+ @Override
+ public Object thirdInterfaceArchivesUpdate(JSONObject object) {
+ JSONObject jsonObject = object.getJSONObject("jsonStr");
+ if (jsonObject == null) {
+ return BaseResult.getFailureMessageEntity("数据为空,请先传递数据");
+ }
+ if (!checkStr(jsonObject.getString("archivesType"))) {
+ return BaseResult.getFailureMessageEntity("档案类型为空");
+ }
+ if (!checkStr(jsonObject.getString("usercode"))) {
+ return BaseResult.getFailureMessageEntity("usercode为空");
+ }
+ if (!checkStr(jsonObject.getString("password"))) {
+ return BaseResult.getFailureMessageEntity("password为空");
+ }
+ if (!checkStr(jsonObject.getString("trantype"))) {
+ return BaseResult.getFailureMessageEntity("trantype为空");
+ }
+ if (!checkStr(jsonObject.getString("system"))) {
+ return BaseResult.getFailureMessageEntity("system为空");
+ }
+ if (!checkStr(jsonObject.getString("data"))) {
+ return BaseResult.getFailureMessageEntity("data为空");
+ }
+ List fzhs = Arrays.asList(new String[]{"1", "2", "6", "73", "D01", "jobass", "93", "96", "22"});
+ if (!fzhs.contains(jsonObject.getString("archivesType"))) {
+ return BaseResult.getFailureMessageEntity("档案类型错误,请联系管理员");
+ }
+ HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
+ // HttpClient
+ CloseableHttpClient closeableHttpClient = httpClientBuilder.disableCookieManagement().build();
+ HttpPost post = new HttpPost(voucherUrl);
+ RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(60000).build();
+ post.setConfig(requestConfig);//设置请求参数【超时时间】
+ post.setHeader("usercode", jsonObject.getString("usercode"));
+ post.setHeader("password", jsonObject.getString("password"));
+ post.setHeader("trantype", jsonObject.getString("trantype"));
+ post.setHeader("system", jsonObject.getString("system"));
+ post.setHeader("publicKey", publicKey);
+ post.setHeader("secretKey", secretKey);
+ post.setHeader("appId", appId);
+ CloseableHttpResponse response = null;
+ switch (jsonObject.getString("archivesType")) {
+ case "1"://人员对照
+ post.setHeader("apiCode", ryApiCodexg);
+ break;
+ case "2"://部门档案
+ post.setHeader("apiCode", bmApiCodexg);
+ break;
+ case "6"://存货对照
+ post.setHeader("apiCode", chApiCodexg);
+ break;
+ case "73"://客商辅助核算
+ post.setHeader("apiCode", ksApiCodexg);
+ break;
+ case "D01"://税率
+ post.setHeader("apiCode", slApiCodexg);
+ break;
+ case "jobass"://项目辅助核算
+ post.setHeader("apiCode", xmApiCodexg);
+ break;
+ case "93"://银行类别
+ post.setHeader("apiCode", yhlbApiCodexg);
+ break;
+ case "96"://银行账户
+ post.setHeader("apiCode", yhzhApiCodexg);
+ break;
+ case "22"://资产类别
+ post.setHeader("apiCode", zcApiCodexg);
+ break;
+ default:
+ break;
+ }
+ StringBuilder body = new StringBuilder();
+ try {
+ ByteArrayEntity byteArrayEntity = new ByteArrayEntity(jsonObject.getString("data").getBytes("UTF-8"));
+ byteArrayEntity.setContentType("application/json");
+ post.setEntity(byteArrayEntity);
+ response = closeableHttpClient.execute(post);
+ HttpEntity httpEntity = response.getEntity();
+ synchronized (lock) {
+ body.append(EntityUtils.toString(httpEntity));
+ }
+ logger.info("返回结果:" + body);
+ JsonResultEntity resultEntity = JSON.parseObject(body.toString(), JsonResultEntity.class);
+ return resultEntity;
+ //JsonResultEntity resultEntity = JSON.parseObject(body.toString(),JsonResultEntity.class);
+ //if(resultEntity.isFlag() && "200".equals(resultEntity.getStatus())){
+ // if(JSONUtil.isTypeJSON(resultEntity.getAttribute().toString())){
+ // //JSONObject attribute = JSONObject.parseObject(resultEntity.getAttribute().toString());
+ // JSONObject attribute = JSONObject.parseObject("{\n" +
+ // " \"status\": \"success\",\n" +
+ // " \"data\": \"[{\\\"pk_invcl\\\":\\\"0001F11000000000I6NN\\\",\\\"invclasscode\\\":\\\"04\\\",\\\"invclassname\\\":\\\"成品测试\\\",\\\"invclasslev\\\":\\\"1\\\",\\\"pk_corp\\\":\\\"0001\\\",\\\"unitcode\\\":\\\"0001\\\",\\\"unitname\\\":\\\"集团\\\"}]\",\n" +
+ // " \"taskNumber\": \"202404250048\"\n" +
+ // "}");
+ // if("success".equals(attribute.getString("status"))){
+ // if(attribute.getString("data") == null || "".equals(attribute.getString("data")) ){
+ // return resultEntity;
+ // }
+ // JSONArray jsonArray = JSONArray.parseArray(attribute.getString("data"));
+ // if(jsonArray == null || jsonArray.size() == 0 ){
+ // return resultEntity;
+ // }
+ // //解析具体数据
+ // switch (jsonObject.getString("archivesType")){
+ // case "1"://人员对照
+ // break;
+ // case "2"://部门档案
+ // break;
+ // case "6"://存货对照
+ // for (int i = 0; i < jsonArray.size(); i++) {
+ // JSONObject object1 = jsonArray.getJSONObject(i);
+ // ArchivesEntity archivesEntity = new ArchivesEntity();
+ // archivesEntity.setArchivesType(jsonObject.getString("archivesType"));
+ // archivesEntity.setUpdate();
+ // archivesEntity.setLeftCode(object1.getString("invclasscode"));//左
+ // archivesEntity.setLeftName(object1.getString("invclassname"));//左
+ // archivesEntity.setRightId(object1.getString("pk_invcl"));//右
+ // archivesEntity.setRightCode(object1.getString("invclasscode"));//右
+ // archivesEntity.setRightName(object1.getString("invclassname"));//右
+ // axDao.updateArchivesByType(archivesEntity);
+ // }
+ // break;
+ // case "73"://客商辅助核算
+ // break;
+ // case "D01"://税率
+ // break;
+ // case "jobass"://项目辅助核算
+ // break;
+ // case "93"://银行类别
+ // break;
+ // case "96"://银行账户
+ // break;
+ // case "22"://资产类别
+ // break;
+ // default:
+ // break;
+ // }
+ // return resultEntity;
+ // }else {
+ // return resultEntity;
+ // }
+ // }else {
+ // return resultEntity;
+ // }
+ //}else {
+ // //解析返回
+ // return resultEntity;
+ //}
+ } catch (Exception e) {
+ logger.error("请求错误:" + e.getMessage());
+ body.append(e.getMessage());
+ return BaseResult.getFailureMessageEntity("转发失败", body);
+ } finally {
+ try {
+ // 关闭响应对象
+ if (response != null) {
+ response.close();
+ }
+ // 关闭响应对象
+ if (closeableHttpClient != null) {
+ closeableHttpClient.close();
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
- RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(60000).build();
- post.setConfig(requestConfig);//设置请求参数【超时时间】
- post.setHeader("usercode", jsonObject.getString("usercode"));
- post.setHeader("password", jsonObject.getString("password"));
- post.setHeader("trantype", jsonObject.getString("trantype"));
- post.setHeader("system", jsonObject.getString("system"));
- post.setHeader("publicKey", publicKey);
- post.setHeader("secretKey", secretKey);
- post.setHeader("appId", appId);
- post.setHeader("needStackTrace", jsonObject.getString("needStackTrace"));
- switch (jsonObject.getString("voucherType")){
- case "add"://新增
- post.setHeader("apiCode", pzApiCodexz);
- break;
- case "update"://修改
- post.setHeader("apiCode", pzApiCodexg);
- break;
- case "delete"://删除
- post.setHeader("apiCode", pzApiCodesc);
- break;
- case "cancellation"://作废
- post.setHeader("apiCode", pzApiCodezf);
- break;
- default:
- break;
- }
- StringBuilder body = new StringBuilder();
- try {
- if (bodys != null && !"".equals(bodys)) {
- ByteArrayEntity byteArrayEntity = new ByteArrayEntity(bodys.getBytes("UTF-8"));
- byteArrayEntity.setContentType("application/json");
- post.setEntity(byteArrayEntity);
- }
- response = closeableHttpClient.execute(post);
- HttpEntity httpEntity = response.getEntity();
- synchronized (lock) {
- body.append(EntityUtils.toString(httpEntity));
- }
- logger.info("返回结果:" + body);
- JsonResultEntity resultEntity = JSON.parseObject(body.toString(),JsonResultEntity.class);
- return resultEntity;
- } catch (Exception e) {
- logger.error("请求错误:" + e.getMessage());
- body.append(e.getMessage());
- return BaseResult.getFailureMessageEntity("转发失败",body);
- }finally {
- try {
- // 关闭响应对象
- if (response != null) {
- response.close();
- }
- // 关闭响应对象
- if (closeableHttpClient != null) {
- closeableHttpClient.close();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- /**
- * @Author lvleigang
- * @Description 档案新增
- * @Date 3:42 下午 2024/4/24
- * @param object
- * @return com.hzya.frame.web.entity.JsonResultEntity
- **/
- @Override
- public Object thirdInterfaceArchivesInsert(JSONObject object) {
- JSONObject jsonObject = object.getJSONObject("jsonStr");
- if(jsonObject == null ){
- return BaseResult.getFailureMessageEntity("数据为空,请先传递数据");
- }
- if(!checkStr(jsonObject.getString("archivesType"))){
- return BaseResult.getFailureMessageEntity("档案类型为空");
- }
- if(!checkStr(jsonObject.getString("usercode"))){
- return BaseResult.getFailureMessageEntity("usercode为空");
- }
- if(!checkStr(jsonObject.getString("password"))){
- return BaseResult.getFailureMessageEntity("password为空");
- }
- if(!checkStr(jsonObject.getString("trantype"))){
- return BaseResult.getFailureMessageEntity("trantype为空");
- }
- if(!checkStr(jsonObject.getString("system"))){
- return BaseResult.getFailureMessageEntity("system为空");
- }
- if(!checkStr(jsonObject.getString("data"))){
- return BaseResult.getFailureMessageEntity("data为空");
- }
- List fzhs = Arrays.asList(new String[]{"1", "2", "6", "73", "D01" , "jobass" , "93" , "96", "22"});
- if(!fzhs.contains(jsonObject.getString("archivesType"))){
- return BaseResult.getFailureMessageEntity("档案类型错误,请联系管理员");
- }
- HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
- // HttpClient
- CloseableHttpClient closeableHttpClient = httpClientBuilder.disableCookieManagement().build();
- HttpPost post = new HttpPost(voucherUrl);
- RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(60000).build();
- post.setConfig(requestConfig);//设置请求参数【超时时间】
- post.setHeader("usercode", jsonObject.getString("usercode"));
- post.setHeader("password", jsonObject.getString("password"));
- post.setHeader("trantype", jsonObject.getString("trantype"));
- post.setHeader("system", jsonObject.getString("system"));
- post.setHeader("publicKey", publicKey);
- post.setHeader("secretKey", secretKey);
- post.setHeader("appId", appId);
- CloseableHttpResponse response = null;
- switch (jsonObject.getString("archivesType")){
- case "1"://人员对照
- post.setHeader("apiCode", ryApiCodexz);
- break;
- case "2"://部门档案
- post.setHeader("apiCode", bmApiCodexz);
- break;
- case "6"://存货对照
- post.setHeader("apiCode", chApiCodexz);
- break;
- case "73"://客商辅助核算
- post.setHeader("apiCode", ksApiCodexz);
- break;
- case "D01"://税率
- post.setHeader("apiCode", slApiCodexz);
- break;
- case "jobass"://项目辅助核算
- post.setHeader("apiCode", xmApiCodexz);
- break;
- case "93"://银行类别
- post.setHeader("apiCode", yhlbApiCodexz);
- break;
- case "96"://银行账户
- post.setHeader("apiCode", yhzhApiCodexz);
- break;
- case "22"://资产类别
- post.setHeader("apiCode", zcApiCodexz);
- break;
- default:
- break;
- }
- StringBuilder body = new StringBuilder();
- try {
- ByteArrayEntity byteArrayEntity = new ByteArrayEntity(jsonObject.getString("data").getBytes("UTF-8"));
- byteArrayEntity.setContentType("application/json");
- post.setEntity(byteArrayEntity);
- response = closeableHttpClient.execute(post);
- HttpEntity httpEntity = response.getEntity();
- synchronized (lock) {
- body.append(EntityUtils.toString(httpEntity));
- }
- logger.info("返回结果:" + body);
- JsonResultEntity resultEntity = JSON.parseObject(body.toString(),JsonResultEntity.class);
- return resultEntity;
- //todo 暂时不保存
- //JsonResultEntity resultEntity = JSON.parseObject(body.toString(),JsonResultEntity.class);
- //if(resultEntity.isFlag() && "200".equals(resultEntity.getStatus())){
- // if(JSONUtil.isTypeJSON(resultEntity.getAttribute().toString())){
- // JSONObject attribute = JSONObject.parseObject(resultEntity.getAttribute().toString());
- // if("success".equals(attribute.getString("status"))){
- // if(attribute.getString("data") == null || "".equals(attribute.getString("data")) ){
- // return resultEntity;
- // }
- // JSONArray jsonArray = JSONArray.parseArray(attribute.getString("data"));
- // if(jsonArray == null || jsonArray.size() == 0 ){
- // return resultEntity;
- // }
- // //解析具体数据
- // switch (jsonObject.getString("archivesType")){
- // case "1"://人员对照
- //
- //
- // break;
- // case "2"://部门档案
- // //[{"pk_corp":"1001","unitcode":"01","unitname":"临安奥星电子股份有限公司","createdate":"2024-04-24","deptattr":"1","deptname":"DEV测试一级部门","deptcode":"99","pk_deptdoc":"1001F1100000000067BR"}]
- // for (int i = 0; i < jsonArray.size(); i++) {
- // JSONObject object1 = jsonArray.getJSONObject(i);
- // ArchivesEntity archivesEntity = new ArchivesEntity();
- // archivesEntity.setArchivesType(jsonObject.getString("archivesType"));
- // archivesEntity.setCreate();
- // archivesEntity.setLeftCode(object1.getString("unitcode"));//左
- // archivesEntity.setLeftName(object1.getString("unitname"));//左
- // archivesEntity.setRightId(object1.getString("pk_deptdoc"));//右
- // archivesEntity.setRightCode(object1.getString("unitcode"));//右
- // archivesEntity.setRightName(object1.getString("unitname"));//右
- // axDao.saveArchivesByType(archivesEntity);
- // }
- // break;
- // case "6"://存货对照
- // for (int i = 0; i < jsonArray.size(); i++) {
- // JSONObject object1 = jsonArray.getJSONObject(i);
- // ArchivesEntity archivesEntity = new ArchivesEntity();
- // archivesEntity.setArchivesType(jsonObject.getString("archivesType"));
- // archivesEntity.setCreate();
- // archivesEntity.setLeftCode(object1.getString("invclasscode"));//左
- // archivesEntity.setLeftName(object1.getString("invclassname"));//左
- // archivesEntity.setRightId(object1.getString("pk_invcl"));//右
- // archivesEntity.setRightCode(object1.getString("invclasscode"));//右
- // archivesEntity.setRightName(object1.getString("invclassname"));//右
- // axDao.saveArchivesByType(archivesEntity);
- // }
- // break;
- // case "73"://客商辅助核算
- // break;
- // case "D01"://税率
- // break;
- // case "jobass"://项目辅助核算
- // break;
- // case "93"://银行类别
- // break;
- // case "96"://银行账户
- // break;
- // case "22"://资产类别
- // break;
- // default:
- // break;
- // }
- // return resultEntity;
- // }else {
- // return resultEntity;
- // }
- // }else {
- // return resultEntity;
- // }
- //}else {
- // //解析返回
- // return resultEntity;
- //}
- } catch (Exception e) {
- logger.error("请求错误:" + e.getMessage());
- body.append(e.getMessage());
- return BaseResult.getFailureMessageEntity("转发失败",body);
- }finally {
- try {
- // 关闭响应对象
- if (response != null) {
- response.close();
- }
- // 关闭响应对象
- if (closeableHttpClient != null) {
- closeableHttpClient.close();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- /**
- * @Author lvleigang
- * @Description 档案修改
- * @Date 3:42 下午 2024/4/24
- * @param object
- * @return com.hzya.frame.web.entity.JsonResultEntity
- **/
- @Override
- public Object thirdInterfaceArchivesUpdate(JSONObject object) {
- JSONObject jsonObject = object.getJSONObject("jsonStr");
- if(jsonObject == null ){
- return BaseResult.getFailureMessageEntity("数据为空,请先传递数据");
- }
- if(!checkStr(jsonObject.getString("archivesType"))){
- return BaseResult.getFailureMessageEntity("档案类型为空");
- }
- if(!checkStr(jsonObject.getString("usercode"))){
- return BaseResult.getFailureMessageEntity("usercode为空");
- }
- if(!checkStr(jsonObject.getString("password"))){
- return BaseResult.getFailureMessageEntity("password为空");
- }
- if(!checkStr(jsonObject.getString("trantype"))){
- return BaseResult.getFailureMessageEntity("trantype为空");
- }
- if(!checkStr(jsonObject.getString("system"))){
- return BaseResult.getFailureMessageEntity("system为空");
- }
- if(!checkStr(jsonObject.getString("data"))){
- return BaseResult.getFailureMessageEntity("data为空");
- }
- List fzhs = Arrays.asList(new String[]{"1", "2", "6", "73", "D01" , "jobass" , "93" , "96", "22"});
- if(!fzhs.contains(jsonObject.getString("archivesType"))){
- return BaseResult.getFailureMessageEntity("档案类型错误,请联系管理员");
- }
- HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
- // HttpClient
- CloseableHttpClient closeableHttpClient = httpClientBuilder.disableCookieManagement().build();
- HttpPost post = new HttpPost(voucherUrl);
- RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(60000).build();
- post.setConfig(requestConfig);//设置请求参数【超时时间】
- post.setHeader("usercode", jsonObject.getString("usercode"));
- post.setHeader("password", jsonObject.getString("password"));
- post.setHeader("trantype", jsonObject.getString("trantype"));
- post.setHeader("system", jsonObject.getString("system"));
- post.setHeader("publicKey", publicKey);
- post.setHeader("secretKey", secretKey);
- post.setHeader("appId", appId);
- CloseableHttpResponse response = null;
- switch (jsonObject.getString("archivesType")){
- case "1"://人员对照
- post.setHeader("apiCode", ryApiCodexg);
- break;
- case "2"://部门档案
- post.setHeader("apiCode", bmApiCodexg);
- break;
- case "6"://存货对照
- post.setHeader("apiCode", chApiCodexg);
- break;
- case "73"://客商辅助核算
- post.setHeader("apiCode", ksApiCodexg);
- break;
- case "D01"://税率
- post.setHeader("apiCode", slApiCodexg);
- break;
- case "jobass"://项目辅助核算
- post.setHeader("apiCode", xmApiCodexg);
- break;
- case "93"://银行类别
- post.setHeader("apiCode", yhlbApiCodexg);
- break;
- case "96"://银行账户
- post.setHeader("apiCode", yhzhApiCodexg);
- break;
- case "22"://资产类别
- post.setHeader("apiCode", zcApiCodexg);
- break;
- default:
- break;
- }
- StringBuilder body = new StringBuilder();
- try {
- ByteArrayEntity byteArrayEntity = new ByteArrayEntity(jsonObject.getString("data").getBytes("UTF-8"));
- byteArrayEntity.setContentType("application/json");
- post.setEntity(byteArrayEntity);
- response = closeableHttpClient.execute(post);
- HttpEntity httpEntity = response.getEntity();
- synchronized (lock) {
- body.append(EntityUtils.toString(httpEntity));
- }
- logger.info("返回结果:" + body);
- JsonResultEntity resultEntity = JSON.parseObject(body.toString(),JsonResultEntity.class);
- return resultEntity;
- //JsonResultEntity resultEntity = JSON.parseObject(body.toString(),JsonResultEntity.class);
- //if(resultEntity.isFlag() && "200".equals(resultEntity.getStatus())){
- // if(JSONUtil.isTypeJSON(resultEntity.getAttribute().toString())){
- // //JSONObject attribute = JSONObject.parseObject(resultEntity.getAttribute().toString());
- // JSONObject attribute = JSONObject.parseObject("{\n" +
- // " \"status\": \"success\",\n" +
- // " \"data\": \"[{\\\"pk_invcl\\\":\\\"0001F11000000000I6NN\\\",\\\"invclasscode\\\":\\\"04\\\",\\\"invclassname\\\":\\\"成品测试\\\",\\\"invclasslev\\\":\\\"1\\\",\\\"pk_corp\\\":\\\"0001\\\",\\\"unitcode\\\":\\\"0001\\\",\\\"unitname\\\":\\\"集团\\\"}]\",\n" +
- // " \"taskNumber\": \"202404250048\"\n" +
- // "}");
- // if("success".equals(attribute.getString("status"))){
- // if(attribute.getString("data") == null || "".equals(attribute.getString("data")) ){
- // return resultEntity;
- // }
- // JSONArray jsonArray = JSONArray.parseArray(attribute.getString("data"));
- // if(jsonArray == null || jsonArray.size() == 0 ){
- // return resultEntity;
- // }
- // //解析具体数据
- // switch (jsonObject.getString("archivesType")){
- // case "1"://人员对照
- // break;
- // case "2"://部门档案
- // break;
- // case "6"://存货对照
- // for (int i = 0; i < jsonArray.size(); i++) {
- // JSONObject object1 = jsonArray.getJSONObject(i);
- // ArchivesEntity archivesEntity = new ArchivesEntity();
- // archivesEntity.setArchivesType(jsonObject.getString("archivesType"));
- // archivesEntity.setUpdate();
- // archivesEntity.setLeftCode(object1.getString("invclasscode"));//左
- // archivesEntity.setLeftName(object1.getString("invclassname"));//左
- // archivesEntity.setRightId(object1.getString("pk_invcl"));//右
- // archivesEntity.setRightCode(object1.getString("invclasscode"));//右
- // archivesEntity.setRightName(object1.getString("invclassname"));//右
- // axDao.updateArchivesByType(archivesEntity);
- // }
- // break;
- // case "73"://客商辅助核算
- // break;
- // case "D01"://税率
- // break;
- // case "jobass"://项目辅助核算
- // break;
- // case "93"://银行类别
- // break;
- // case "96"://银行账户
- // break;
- // case "22"://资产类别
- // break;
- // default:
- // break;
- // }
- // return resultEntity;
- // }else {
- // return resultEntity;
- // }
- // }else {
- // return resultEntity;
- // }
- //}else {
- // //解析返回
- // return resultEntity;
- //}
- } catch (Exception e) {
- logger.error("请求错误:" + e.getMessage());
- body.append(e.getMessage());
- return BaseResult.getFailureMessageEntity("转发失败",body);
- }finally {
- try {
- // 关闭响应对象
- if (response != null) {
- response.close();
- }
- // 关闭响应对象
- if (closeableHttpClient != null) {
- closeableHttpClient.close();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- /**
- * @Author lvleigang
- * @Description 档案删除
- * @Date 3:42 下午 2024/4/24
- * @param object
- * @return com.hzya.frame.web.entity.JsonResultEntity
- **/
- @Override
- public Object thirdInterfaceArchivesDelete(JSONObject object) {
- JSONObject jsonObject = object.getJSONObject("jsonStr");
- if(jsonObject == null ){
- return BaseResult.getFailureMessageEntity("数据为空,请先传递数据");
- }
- if(!checkStr(jsonObject.getString("archivesType"))){
- return BaseResult.getFailureMessageEntity("档案类型为空");
- }
- if(!checkStr(jsonObject.getString("usercode"))){
- return BaseResult.getFailureMessageEntity("usercode为空");
- }
- if(!checkStr(jsonObject.getString("password"))){
- return BaseResult.getFailureMessageEntity("password为空");
- }
- if(!checkStr(jsonObject.getString("trantype"))){
- return BaseResult.getFailureMessageEntity("trantype为空");
- }
- if(!checkStr(jsonObject.getString("system"))){
- return BaseResult.getFailureMessageEntity("system为空");
- }
- if(!checkStr(jsonObject.getString("data"))){
- return BaseResult.getFailureMessageEntity("data为空");
- }
- List fzhs = Arrays.asList(new String[]{"1", "2", "6", "73", "D01" , "jobass" , "93" , "96", "22"});
- if(!fzhs.contains(jsonObject.getString("archivesType"))){
- return BaseResult.getFailureMessageEntity("档案类型错误,请联系管理员");
- }
- HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
- // HttpClient
- CloseableHttpClient closeableHttpClient = httpClientBuilder.disableCookieManagement().build();
- HttpPost post = new HttpPost(voucherUrl);
- RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(60000).build();
- post.setConfig(requestConfig);//设置请求参数【超时时间】
- post.setHeader("usercode", jsonObject.getString("usercode"));
- post.setHeader("password", jsonObject.getString("password"));
- post.setHeader("trantype", jsonObject.getString("trantype"));
- post.setHeader("system", jsonObject.getString("system"));
- post.setHeader("publicKey", publicKey);
- post.setHeader("secretKey", secretKey);
- post.setHeader("appId", appId);
- CloseableHttpResponse response = null;
- switch (jsonObject.getString("archivesType")){
- case "1"://人员对照
- post.setHeader("apiCode", ryApiCodesc);
- break;
- case "2"://部门档案
- post.setHeader("apiCode", bmApiCodesc);
- break;
- case "6"://存货对照
- post.setHeader("apiCode", chApiCodesc);
- break;
- case "73"://客商辅助核算
- post.setHeader("apiCode", ksApiCodesc);
- break;
- case "D01"://税率
- post.setHeader("apiCode", slApiCodesc);
- break;
- case "jobass"://项目辅助核算
- post.setHeader("apiCode", xmApiCodesc);
- break;
- case "93"://银行类别
- post.setHeader("apiCode", yhlbApiCodesc);
- break;
- case "96"://银行账户
- post.setHeader("apiCode", yhzhApiCodesc);
- break;
- case "22"://资产类别
- post.setHeader("apiCode", zcApiCodesc);
- break;
- default:
- break;
- }
- StringBuilder body = new StringBuilder();
- try {
- ByteArrayEntity byteArrayEntity = new ByteArrayEntity(jsonObject.getString("data").getBytes("UTF-8"));
- byteArrayEntity.setContentType("application/json");
- post.setEntity(byteArrayEntity);
- response = closeableHttpClient.execute(post);
- HttpEntity httpEntity = response.getEntity();
- synchronized (lock) {
- body.append(EntityUtils.toString(httpEntity));
- }
- logger.info("返回结果:" + body);
- JsonResultEntity resultEntity = JSON.parseObject(body.toString(),JsonResultEntity.class);
- return resultEntity;
- //JsonResultEntity resultEntity = JSON.parseObject(body.toString(),JsonResultEntity.class);
- //if(resultEntity.isFlag() && "200".equals(resultEntity.getStatus())){
- // if(JSONUtil.isTypeJSON(resultEntity.getAttribute().toString())){
- // //JSONObject attribute = JSONObject.parseObject(resultEntity.getAttribute().toString());
- // JSONObject attribute = JSONObject.parseObject("{\n" +
- // " \"status\": \"success\",\n" +
- // " \"data\": \"[{\\\"pk_invcl\\\":\\\"0001F11000000000I6NN\\\",\\\"invclasscode\\\":\\\"04\\\",\\\"invclassname\\\":\\\"成品测试\\\",\\\"invclasslev\\\":\\\"1\\\",\\\"pk_corp\\\":\\\"0001\\\",\\\"unitcode\\\":\\\"0001\\\",\\\"unitname\\\":\\\"集团\\\"}]\",\n" +
- // " \"taskNumber\": \"202404250048\"\n" +
- // "}");
- // if("success".equals(attribute.getString("status"))){
- // if(attribute.getString("data") == null || "".equals(attribute.getString("data")) ){
- // return resultEntity;
- // }
- // JSONArray jsonArray = JSONArray.parseArray(attribute.getString("data"));
- // if(jsonArray == null || jsonArray.size() == 0 ){
- // return resultEntity;
- // }
- // //解析具体数据
- // switch (jsonObject.getString("archivesType")){
- // case "1"://人员对照
- // break;
- // case "2"://部门档案
- // break;
- // case "6"://存货对照
- // for (int i = 0; i < jsonArray.size(); i++) {
- // JSONObject object1 = jsonArray.getJSONObject(i);
- // ArchivesEntity archivesEntity = new ArchivesEntity();
- // archivesEntity.setArchivesType(jsonObject.getString("archivesType"));
- // archivesEntity.setUpdate();
- // archivesEntity.setLeftCode(object1.getString("invclasscode"));//左
- // archivesEntity.setLeftName(object1.getString("invclassname"));//左
- // archivesEntity.setRightId(object1.getString("pk_invcl"));//右
- // archivesEntity.setRightCode(object1.getString("invclasscode"));//右
- // archivesEntity.setRightName(object1.getString("invclassname"));//右
- // axDao.deleteArchivesByType(archivesEntity);
- // }
- // break;
- // case "73"://客商辅助核算
- // break;
- // case "D01"://税率
- // break;
- // case "jobass"://项目辅助核算
- // break;
- // case "93"://银行类别
- // break;
- // case "96"://银行账户
- // break;
- // case "22"://资产类别
- // break;
- // default:
- // break;
- // }
- // return resultEntity;
- // }else {
- // return resultEntity;
- // }
- // }else {
- // return resultEntity;
- // }
- //}else {
- // //解析返回
- // return resultEntity;
- //}
- } catch (Exception e) {
- logger.error("请求错误:" + e.getMessage());
- body.append(e.getMessage());
- return BaseResult.getFailureMessageEntity("转发失败",body);
- }finally {
- try {
- // 关闭响应对象
- if (response != null) {
- response.close();
- }
- // 关闭响应对象
- if (closeableHttpClient != null) {
- closeableHttpClient.close();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
+ /**
+ * @param object
+ * @return com.hzya.frame.web.entity.JsonResultEntity
+ * @Author lvleigang
+ * @Description 档案删除
+ * @Date 3:42 下午 2024/4/24
+ **/
+ @Override
+ public Object thirdInterfaceArchivesDelete(JSONObject object) {
+ JSONObject jsonObject = object.getJSONObject("jsonStr");
+ if (jsonObject == null) {
+ return BaseResult.getFailureMessageEntity("数据为空,请先传递数据");
+ }
+ if (!checkStr(jsonObject.getString("archivesType"))) {
+ return BaseResult.getFailureMessageEntity("档案类型为空");
+ }
+ if (!checkStr(jsonObject.getString("usercode"))) {
+ return BaseResult.getFailureMessageEntity("usercode为空");
+ }
+ if (!checkStr(jsonObject.getString("password"))) {
+ return BaseResult.getFailureMessageEntity("password为空");
+ }
+ if (!checkStr(jsonObject.getString("trantype"))) {
+ return BaseResult.getFailureMessageEntity("trantype为空");
+ }
+ if (!checkStr(jsonObject.getString("system"))) {
+ return BaseResult.getFailureMessageEntity("system为空");
+ }
+ if (!checkStr(jsonObject.getString("data"))) {
+ return BaseResult.getFailureMessageEntity("data为空");
+ }
+ List fzhs = Arrays.asList(new String[]{"1", "2", "6", "73", "D01", "jobass", "93", "96", "22"});
+ if (!fzhs.contains(jsonObject.getString("archivesType"))) {
+ return BaseResult.getFailureMessageEntity("档案类型错误,请联系管理员");
+ }
+ HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
+ // HttpClient
+ CloseableHttpClient closeableHttpClient = httpClientBuilder.disableCookieManagement().build();
+ HttpPost post = new HttpPost(voucherUrl);
+ RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(60000).build();
+ post.setConfig(requestConfig);//设置请求参数【超时时间】
+ post.setHeader("usercode", jsonObject.getString("usercode"));
+ post.setHeader("password", jsonObject.getString("password"));
+ post.setHeader("trantype", jsonObject.getString("trantype"));
+ post.setHeader("system", jsonObject.getString("system"));
+ post.setHeader("publicKey", publicKey);
+ post.setHeader("secretKey", secretKey);
+ post.setHeader("appId", appId);
+ CloseableHttpResponse response = null;
+ switch (jsonObject.getString("archivesType")) {
+ case "1"://人员对照
+ post.setHeader("apiCode", ryApiCodesc);
+ break;
+ case "2"://部门档案
+ post.setHeader("apiCode", bmApiCodesc);
+ break;
+ case "6"://存货对照
+ post.setHeader("apiCode", chApiCodesc);
+ break;
+ case "73"://客商辅助核算
+ post.setHeader("apiCode", ksApiCodesc);
+ break;
+ case "D01"://税率
+ post.setHeader("apiCode", slApiCodesc);
+ break;
+ case "jobass"://项目辅助核算
+ post.setHeader("apiCode", xmApiCodesc);
+ break;
+ case "93"://银行类别
+ post.setHeader("apiCode", yhlbApiCodesc);
+ break;
+ case "96"://银行账户
+ post.setHeader("apiCode", yhzhApiCodesc);
+ break;
+ case "22"://资产类别
+ post.setHeader("apiCode", zcApiCodesc);
+ break;
+ default:
+ break;
+ }
+ StringBuilder body = new StringBuilder();
+ try {
+ ByteArrayEntity byteArrayEntity = new ByteArrayEntity(jsonObject.getString("data").getBytes("UTF-8"));
+ byteArrayEntity.setContentType("application/json");
+ post.setEntity(byteArrayEntity);
+ response = closeableHttpClient.execute(post);
+ HttpEntity httpEntity = response.getEntity();
+ synchronized (lock) {
+ body.append(EntityUtils.toString(httpEntity));
+ }
+ logger.info("返回结果:" + body);
+ JsonResultEntity resultEntity = JSON.parseObject(body.toString(), JsonResultEntity.class);
+ return resultEntity;
+ //JsonResultEntity resultEntity = JSON.parseObject(body.toString(),JsonResultEntity.class);
+ //if(resultEntity.isFlag() && "200".equals(resultEntity.getStatus())){
+ // if(JSONUtil.isTypeJSON(resultEntity.getAttribute().toString())){
+ // //JSONObject attribute = JSONObject.parseObject(resultEntity.getAttribute().toString());
+ // JSONObject attribute = JSONObject.parseObject("{\n" +
+ // " \"status\": \"success\",\n" +
+ // " \"data\": \"[{\\\"pk_invcl\\\":\\\"0001F11000000000I6NN\\\",\\\"invclasscode\\\":\\\"04\\\",\\\"invclassname\\\":\\\"成品测试\\\",\\\"invclasslev\\\":\\\"1\\\",\\\"pk_corp\\\":\\\"0001\\\",\\\"unitcode\\\":\\\"0001\\\",\\\"unitname\\\":\\\"集团\\\"}]\",\n" +
+ // " \"taskNumber\": \"202404250048\"\n" +
+ // "}");
+ // if("success".equals(attribute.getString("status"))){
+ // if(attribute.getString("data") == null || "".equals(attribute.getString("data")) ){
+ // return resultEntity;
+ // }
+ // JSONArray jsonArray = JSONArray.parseArray(attribute.getString("data"));
+ // if(jsonArray == null || jsonArray.size() == 0 ){
+ // return resultEntity;
+ // }
+ // //解析具体数据
+ // switch (jsonObject.getString("archivesType")){
+ // case "1"://人员对照
+ // break;
+ // case "2"://部门档案
+ // break;
+ // case "6"://存货对照
+ // for (int i = 0; i < jsonArray.size(); i++) {
+ // JSONObject object1 = jsonArray.getJSONObject(i);
+ // ArchivesEntity archivesEntity = new ArchivesEntity();
+ // archivesEntity.setArchivesType(jsonObject.getString("archivesType"));
+ // archivesEntity.setUpdate();
+ // archivesEntity.setLeftCode(object1.getString("invclasscode"));//左
+ // archivesEntity.setLeftName(object1.getString("invclassname"));//左
+ // archivesEntity.setRightId(object1.getString("pk_invcl"));//右
+ // archivesEntity.setRightCode(object1.getString("invclasscode"));//右
+ // archivesEntity.setRightName(object1.getString("invclassname"));//右
+ // axDao.deleteArchivesByType(archivesEntity);
+ // }
+ // break;
+ // case "73"://客商辅助核算
+ // break;
+ // case "D01"://税率
+ // break;
+ // case "jobass"://项目辅助核算
+ // break;
+ // case "93"://银行类别
+ // break;
+ // case "96"://银行账户
+ // break;
+ // case "22"://资产类别
+ // break;
+ // default:
+ // break;
+ // }
+ // return resultEntity;
+ // }else {
+ // return resultEntity;
+ // }
+ // }else {
+ // return resultEntity;
+ // }
+ //}else {
+ // //解析返回
+ // return resultEntity;
+ //}
+ } catch (Exception e) {
+ logger.error("请求错误:" + e.getMessage());
+ body.append(e.getMessage());
+ return BaseResult.getFailureMessageEntity("转发失败", body);
+ } finally {
+ try {
+ // 关闭响应对象
+ if (response != null) {
+ response.close();
+ }
+ // 关闭响应对象
+ if (closeableHttpClient != null) {
+ closeableHttpClient.close();
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
}
From 92916e872c590129cf2e47da06c50b5ae03c8e20 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Fri, 9 Aug 2024 16:46:34 +0800
Subject: [PATCH 20/26] =?UTF-8?q?GrpU8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dao/impl/AcctVouchInfoDaoImpl.java | 2 +
.../service/IAcctVouchInfoService.java | 12 ++++-
.../impl/AcctVouchInfoServiceImpl.java | 52 +++++++++++++++++--
.../dao/impl/DictAcctSubjDaoImpl.java | 3 +-
.../service/IDictAcctSubjService.java | 2 +-
.../service/impl/DictAcctSubjServiceImpl.java | 13 +++--
.../dao/impl/DictCheckTypeDaoImpl.java | 2 +
.../service/IDictCheckTypeService.java | 2 +-
.../impl/DictCheckTypeServiceImpl.java | 12 +++--
9 files changed, 85 insertions(+), 15 deletions(-)
diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java
index 38e0cd95..cfbf3b6b 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java
+++ b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java
@@ -1,5 +1,6 @@
package com.hzya.frame.grpU8.acctVouchInfo.dao.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity;
import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity;
import com.hzya.frame.grpU8.acctVouchInfo.dao.IAcctVouchInfoDao;
@@ -18,6 +19,7 @@ import java.util.List;
@Repository(value = "AcctVouchInfoDaoImpl")
public class AcctVouchInfoDaoImpl extends MybatisGenericDao implements IAcctVouchInfoDao {
+ @DS("#entity.dataSourceCode")
@Override
public List queryData(AcctVouchInfoEntity entity) {
List o = (List) super.selectList(getSqlIdPrifx() + "queryData", entity);
diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java
index 22bd525c..0c41c1fb 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java
+++ b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java
@@ -1,6 +1,7 @@
package com.hzya.frame.grpU8.acctVouchInfo.service;
import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
import com.hzya.frame.web.entity.JsonResultEntity;
import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity;
import com.hzya.frame.basedao.service.IBaseService;
@@ -18,5 +19,14 @@ public interface IAcctVouchInfoService extends IBaseService implements IAcctVouchInfoService {
private IAcctVouchInfoDao acctVouchInfoDao;
+
+ @Resource
+ private ISysApplicationDatabaseDao sysApplicationDatabaseDao;
@Autowired
public void setAcctVouchInfoDao(IAcctVouchInfoDao dao) {
@@ -42,7 +52,7 @@ public class AcctVouchInfoServiceImpl extends BaseService list = acctVouchInfoDao.queryData(entity);
PageInfo pageInfo = new PageInfo(list);
- return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
+ JSONObject object = new JSONObject();
+ object.put("status","success");
+ object.put("data",pageInfo);
+ return object;
}else {
List list = acctVouchInfoDao.queryData(entity);
- return BaseResult.getSuccessMessageEntity("查询数据成功", list);
+ JSONObject object = new JSONObject();
+ object.put("status","success");
+ object.put("data",list);
+ return object; }
+ }
+
+ /**
+ * @param entity
+ * @return com.hzya.frame.web.entity.JsonResultEntity
+ * @Author lvleigang
+ * @Description 数据表
+ * @Date 11:52 上午 2024/3/27
+ **/
+ @Override
+ public SysExtensionApiEntity addDataSourceCode(SysExtensionApiEntity entity) {
+ try {
+ SysApplicationEntity applicationEntity = entity.getReceiveApp();
+ SysApplicationDatabaseEntity sysApplicationDatabaseEntity = new SysApplicationDatabaseEntity();
+ sysApplicationDatabaseEntity.setSts("Y");
+ sysApplicationDatabaseEntity.setDbStatus("1");
+ sysApplicationDatabaseEntity.setAppId(applicationEntity.getId());
+ sysApplicationDatabaseEntity.setDataSourceCode("master");
+ List sysDataSourceEntities = sysApplicationDatabaseDao.queryDSBase(sysApplicationDatabaseEntity);
+ if(sysDataSourceEntities != null && sysDataSourceEntities.size() > 0){
+ String parm = entity.getBodys();
+ JSONObject jsonObject = JSONObject.parseObject(parm);
+ jsonObject.put("dataSourceCode",sysDataSourceEntities.get(0).getSourceCode());
+ entity.setBodys(jsonObject.toJSONString());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
}
+ return entity;
}
}
diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/impl/DictAcctSubjDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/impl/DictAcctSubjDaoImpl.java
index d29909f5..ad55ad36 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/impl/DictAcctSubjDaoImpl.java
+++ b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/impl/DictAcctSubjDaoImpl.java
@@ -1,5 +1,6 @@
package com.hzya.frame.grpU8.dictAcctSubj.dao.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity;
import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntityVo;
import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntity;
@@ -18,7 +19,7 @@ import java.util.List;
*/
@Repository(value = "DictAcctSubjDaoImpl")
public class DictAcctSubjDaoImpl extends MybatisGenericDao implements IDictAcctSubjDao{
-
+ @DS("#entity.dataSourceCode")
@Override
public List queryData(DictAcctSubjEntity entity) {
List o = (List) super.selectList(getSqlIdPrifx() + "queryData", entity);
diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/IDictAcctSubjService.java b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/IDictAcctSubjService.java
index cfc15097..cde9e036 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/IDictAcctSubjService.java
+++ b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/IDictAcctSubjService.java
@@ -18,5 +18,5 @@ public interface IDictAcctSubjService extends IBaseService list = dictAcctSubjDao.queryData(entity);
PageInfo pageInfo = new PageInfo(list);
- return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
+ JSONObject object = new JSONObject();
+ object.put("status","success");
+ object.put("data",pageInfo);
+ return object;
}else {
List list = dictAcctSubjDao.queryData(entity);
- return BaseResult.getSuccessMessageEntity("查询数据成功", list);
- }
+ JSONObject object = new JSONObject();
+ object.put("status","success");
+ object.put("data",list);
+ return object; }
}
}
diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java
index a0b0809d..76955876 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java
+++ b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java
@@ -1,5 +1,6 @@
package com.hzya.frame.grpU8.dictCheckType.dao.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntity;
import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntityVo;
import com.hzya.frame.grpU8.dictCheckType.entity.DictCheckTypeEntity;
@@ -19,6 +20,7 @@ import java.util.List;
@Repository(value = "DictCheckTypeDaoImpl")
public class DictCheckTypeDaoImpl extends MybatisGenericDao implements IDictCheckTypeDao{
+ @DS("#entity.dataSourceCode")
@Override
public List queryData(DictCheckTypeEntity entity) {
List o = (List) super.selectList(getSqlIdPrifx() + "queryData", entity);
diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/IDictCheckTypeService.java b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/IDictCheckTypeService.java
index 6fb1e77f..b47bb474 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/IDictCheckTypeService.java
+++ b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/IDictCheckTypeService.java
@@ -18,5 +18,5 @@ public interface IDictCheckTypeService extends IBaseService list = dictCheckTypeDao.queryData(entity);
PageInfo pageInfo = new PageInfo(list);
- return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
+ JSONObject object = new JSONObject();
+ object.put("status","success");
+ object.put("data",pageInfo);
+ return object;
}else {
List list = dictCheckTypeDao.queryData(entity);
- return BaseResult.getSuccessMessageEntity("查询数据成功", list);
+ JSONObject object = new JSONObject();
+ object.put("status","success");
+ object.put("data",list);
+ return object;
}
}
}
From d5e4699ea4284d3d5828b1d31b922c17fe325f50 Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Mon, 12 Aug 2024 11:15:40 +0800
Subject: [PATCH 21/26] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E7=B3=8A?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95=EF=BC=8Capi=E8=81=94?=
=?UTF-8?q?=E6=9F=A5=E5=BA=94=E7=94=A8=20/2024=E5=B9=B48=E6=9C=8812?=
=?UTF-8?q?=E6=97=A5=2011:15:33?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/entity/SysApplicationApiEntity.xml | 90 +++++++++++++++++++
.../service/ISysApplicationApiService.java | 9 ++
.../impl/SysApplicationApiServiceImpl.java | 12 +++
3 files changed, 111 insertions(+)
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml
index a40e6f7a..3ab36441 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml
@@ -79,6 +79,28 @@
,sts
,org_id
+
+
+ sys_application_api.id,
+ sys_application.app_id,
+ sys_application_api.api_code,
+ sys_application_api.api_name,
+ sys_application_api.api_remark,
+ sys_application_api.destination_address,
+ sys_application_api.header_in,
+ sys_application_api.query_in,
+ sys_application_api.body_in_type,
+ sys_application_api.body_in,
+ sys_application_api.body_out,
+ sys_application_api.body_in_type,
+ sys_application_api.sorts,
+ sys_application_api.bean_name,
+ sys_application_api.fun_name,
+ sys_application_api.extension_api,
+ sys_application_api.return_success_field,
+ sys_application_api.return_success_value,
+ sys_application_api.return_msg
+
SELECT
@@ -299,6 +321,74 @@ WHERE
order by ${sort} ${order}
+
+
+
+ select
+
+ from sys_application_api
+ LEFT JOIN sys_application on sys_application.id = sys_application_api.app_id
+
+ and sys_application_api.id like concat('%',#{id},'%')
+ and sys_application_api.api_status like concat('%',#{apiStatus},'%')
+ and sys_application_api.api_code like concat('%',#{apiCode},'%')
+ and sys_application_api.api_path like concat('%',#{apiPath},'%')
+ and sys_application_api.app_id like concat('%',#{appId},'%')
+ and sys_application_api.catalogue_id like concat('%',#{catalogueId},'%')
+
+ and sys_application_api.api_name like concat('%',#{apiName},'%')
+ and sys_application_api.api_remark like concat('%',#{apiRemark},'%')
+ and sys_application_api.need_Login like concat('%',#{needLogin},'%')
+ and sys_application_api.authentication_port like
+ concat('%',#{authenticationPort},'%')
+
+ and sys_application_api.parameter_passing_mode like
+ concat('%',#{parameterPassingMode},'%')
+
+ and sys_application_api.destination_address like
+ concat('%',#{destinationAddress},'%')
+
+ and sys_application_api.request_coding like
+ concat('%',#{requestCoding},'%')
+
+ and sys_application_api.request_method like
+ concat('%',#{requestMethod},'%')
+
+ and sys_application_api.timeout_period like
+ concat('%',#{timeoutPeriod},'%')
+
+ and sys_application_api.current_limiting like
+ concat('%',#{currentLimiting},'%')
+
+ and sys_application_api.header_in like concat('%',#{headerIn},'%')
+ and sys_application_api.query_in like concat('%',#{queryIn},'%')
+ and sys_application_api.body_in_type like concat('%',#{bodyInType},'%')
+ and sys_application_api.body_in like concat('%',#{bodyIn},'%')
+ and sys_application_api.body_out like concat('%',#{bodyOut},'%')
+ and sys_application_api.bean_name like concat('%',#{beanName},'%')
+ and sys_application_api.return_msg like concat('%',#{returnMsg},'%')
+ and sys_application_api.return_success_field like concat('%',#{returnSuccessField},'%')
+ and sys_application_api.return_success_value like concat('%',#{returnSuccessValue},'%')
+ and sys_application_api.fun_name like concat('%',#{funName},'%')
+ and sys_application_api.extension_api like concat('%',#{extensionApi},'%')
+ and sys_application_api.sorts like concat('%',#{sorts},'%')
+ and sys_application_api.create_user_id like
+ concat('%',#{create_user_id},'%')
+
+ and sys_application_api.create_time like concat('%',#{create_time},'%')
+ and sys_application_api.modify_user_id like
+ concat('%',#{modify_user_id},'%')
+
+ and sys_application_api.modify_time like concat('%',#{modify_time},'%')
+ and sys_application_api.sts like concat('%',#{sts},'%')
+ and sys_application_api.org_id like concat('%',#{org_id},'%')
+ and sys_application_api.sts = 'Y'
+ and sys_application.sts = 'Y'
+
+ order by sys_application.app_id, sys_application_api.sorts
+
+
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/api/service/ISysApplicationApiService.java b/service/src/main/java/com/hzya/frame/sysnew/application/api/service/ISysApplicationApiService.java
index 8cf2a685..2218bf04 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/api/service/ISysApplicationApiService.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/api/service/ISysApplicationApiService.java
@@ -5,6 +5,8 @@ import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity;
import com.hzya.frame.basedao.service.IBaseService;
import com.hzya.frame.web.entity.JsonResultEntity;
+import java.util.List;
+
/**
* 应用api(SysApplicationApi)表服务接口
*
@@ -21,4 +23,11 @@ public interface ISysApplicationApiService extends IBaseService queryLike(SysApplicationApiEntity entity);
}
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/api/service/impl/SysApplicationApiServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/api/service/impl/SysApplicationApiServiceImpl.java
index 682f8f64..488d88f6 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/api/service/impl/SysApplicationApiServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/api/service/impl/SysApplicationApiServiceImpl.java
@@ -48,4 +48,16 @@ public class SysApplicationApiServiceImpl extends BaseService list = sysApplicationApiDao.queryByLike(entity);
return BaseResult.getSuccessMessageEntity("查询数据成功", list);
}
+
+ /**
+ * 模糊查询,联查sys_app
+ *
+ * @param entity
+ * @return
+ */
+ @Override
+ public List queryLike(SysApplicationApiEntity entity) {
+ List list = sysApplicationApiDao.queryList(entity, "com.hzya.frame.sysnew.application.api.dao.impl.SysApplicationApiDaoImpl.entity_list_like_join_sysApp");
+ return list;
+ }
}
From fbae83138df9b80eaed18c128378e61f97f39622 Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Mon, 12 Aug 2024 11:22:17 +0800
Subject: [PATCH 22/26] =?UTF-8?q?=E5=A2=9E=E5=8A=A0appCode=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=202024=E5=B9=B48=E6=9C=8812=E6=97=A5=2011:22:11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/entity/SysApplicationApiEntity.java | 11 ++++++++---
.../api/entity/SysApplicationApiEntity.xml | 5 +++--
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java
index 67456b9f..d0d8e10e 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java
@@ -23,6 +23,8 @@ public class SysApplicationApiEntity extends BaseEntity {
/** 接口编码 */
private Long apiCode;
/** Api接口地址(固定系统内部外放接口地址) */
+ //应用编码
+ private Long appCode;
private String apiPath;
/** 1启用2停用 */
private String apiStatus;
@@ -312,9 +314,12 @@ public class SysApplicationApiEntity extends BaseEntity {
this.appUrl = appUrl;
}
+ public Long getAppCode() {
+ return appCode;
+ }
-
-
-
+ public void setAppCode(Long appCode) {
+ this.appCode = appCode;
+ }
}
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml
index 3ab36441..089b6eb5 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml
@@ -7,6 +7,7 @@
+
@@ -81,8 +82,8 @@
- sys_application_api.id,
- sys_application.app_id,
+ sys_application_api.id,
+ sys_application.app_id as app_code,
sys_application_api.api_code,
sys_application_api.api_name,
sys_application_api.api_remark,
From a92d144e4562bcf0e454c039ecf6d664cab0f673 Mon Sep 17 00:00:00 2001
From: hecan <1718492867@qq.com>
Date: Tue, 13 Aug 2024 16:35:48 +0800
Subject: [PATCH 23/26] GRPU8
---
.../gbizbsyrec/dao/IGbiZbsyrecDao.java | 15 +
.../dao/impl/GbiZbsyrecDaoImpl.java | 17 +
.../gbizbsyrec/entity/GbiZbsyrecEntity.java | 186 +++
.../gbizbsyrec/entity/GbiZbsyrecEntity.xml | 170 +++
.../service/IGbiZbsyrecService.java | 11 +
.../service/impl/GbiZbsyrecServiceImpl.java | 15 +
.../nxproof/glPzml/dao/ISenderGlPzmlDao.java | 89 ++
.../glPzml/dao/impl/SenderGlPzmlDaoImpl.java | 64 +
.../glPzml/entity/SenderGlPzmlEntity.java | 371 +++++
.../glPzml/entity/SenderGlPzmlEntity.xml | 511 +++++++
.../glPzml/service/ISenderGlPzmlService.java | 96 ++
.../service/impl/SenderGlPzmlServiceImpl.java | 668 +++++++++
.../nxproof/glPznr/dao/ISenderGlPznrDao.java | 98 ++
.../glPznr/dao/impl/SenderGlPznrDaoImpl.java | 74 +
.../glPznr/entity/SenderGlPznrEntity.java | 818 +++++++++++
.../glPznr/entity/SenderGlPznrEntity.xml | 896 ++++++++++++
.../glPznr/service/ISenderGlPznrService.java | 14 +
.../service/impl/SenderGlPznrServiceImpl.java | 26 +
.../nxproof/glYeb/dao/ISenderGlYebDao.java | 80 ++
.../glYeb/dao/impl/SenderGlYebDaoImpl.java | 57 +
.../glYeb/entity/SenderGlYebEntity.java | 630 +++++++++
.../glYeb/entity/SenderGlYebEntity.xml | 732 ++++++++++
.../glYeb/service/ISenderGlYebService.java | 69 +
.../service/impl/SenderGlYebServiceImpl.java | 363 +++++
.../nxproof/glZtcs/dao/ISenderGlZtcsDao.java | 89 ++
.../glZtcs/dao/impl/SenderGlZtcsDaoImpl.java | 61 +
.../glZtcs/entity/SenderGlZtcsEntity.java | 971 +++++++++++++
.../glZtcs/entity/SenderGlZtcsEntity.xml | 1222 +++++++++++++++++
.../glZtcs/service/ISenderGlZtcsService.java | 80 ++
.../service/impl/SenderGlZtcsServiceImpl.java | 478 +++++++
.../nxproof/glkmxx/dao/ISenderGlKmxxDao.java | 91 ++
.../glkmxx/dao/impl/SenderGlKmxxDaoImpl.java | 65 +
.../glkmxx/entity/SenderGlKmxxEntity.java | 396 ++++++
.../glkmxx/entity/SenderGlKmxxEntity.xml | 529 +++++++
.../glkmxx/service/ISenderGlKmxxService.java | 92 ++
.../service/impl/SenderGlKmxxServiceImpl.java | 469 +++++++
.../nxproof/glxmzl/dao/ISenderGlXmzlDao.java | 89 ++
.../glxmzl/dao/impl/SenderGlXmzlDaoImpl.java | 62 +
.../glxmzl/entity/SenderGlXmzlEntity.java | 296 ++++
.../glxmzl/entity/SenderGlXmzlEntity.xml | 440 ++++++
.../glxmzl/service/ISenderGlXmzlService.java | 79 ++
.../service/impl/SenderGlXmzlServiceImpl.java | 393 ++++++
.../nxproof/oerdjjsfs/dao/IOerDjjsfsDao.java | 15 +
.../oerdjjsfs/dao/impl/OerDjjsfsDaoImpl.java | 18 +
.../oerdjjsfs/entity/OerDjjsfsEntity.java | 231 ++++
.../oerdjjsfs/entity/OerDjjsfsEntity.xml | 132 ++
.../oerdjjsfs/service/IOerDjjsfsService.java | 11 +
.../service/impl/OerDjjsfsServiceImpl.java | 15 +
.../oerdjml/controller/OerDjmlController.java | 122 ++
.../nxproof/oerdjml/dao/IOerDjmlDao.java | 40 +
.../oerdjml/dao/impl/OerDjmlDaoImpl.java | 59 +
.../nxproof/oerdjml/entity/OerDjmlEntity.java | 313 +++++
.../nxproof/oerdjml/entity/OerDjmlEntity.xml | 192 +++
.../oerdjml/service/IOerDjmlService.java | 28 +
.../service/impl/OerDjmlServiceImpl.java | 602 ++++++++
.../nxproof/oerdjnr/dao/IOerDjnrDao.java | 15 +
.../oerdjnr/dao/impl/OerDjnrDaoImpl.java | 17 +
.../nxproof/oerdjnr/entity/OerDjnrEntity.java | 222 +++
.../nxproof/oerdjnr/entity/OerDjnrEntity.xml | 94 ++
.../oerdjnr/service/IOerDjnrService.java | 11 +
.../service/impl/OerDjnrServiceImpl.java | 15 +
.../nxproof/oeryszb/dao/IOerYszbDao.java | 14 +
.../oeryszb/dao/impl/OerYszbDaoImpl.java | 18 +
.../nxproof/oeryszb/entity/OerYszbEntity.java | 150 ++
.../nxproof/oeryszb/entity/OerYszbEntity.xml | 72 +
.../oeryszb/service/IOerYszbService.java | 11 +
.../service/impl/OerYszbServiceImpl.java | 15 +
.../pubauditlog/dao/IPubAuditLogDao.java | 14 +
.../dao/impl/PubAuditLogDaoImpl.java | 18 +
.../pubauditlog/entity/PubAuditLogEntity.java | 195 +++
.../pubauditlog/entity/PubAuditLogEntity.xml | 97 ++
.../service/IPubAuditLogService.java | 11 +
.../service/impl/PubAuditLogServiceImpl.java | 15 +
.../pubbmxx/dao/ISenderPubbmxxDao.java | 92 ++
.../dao/impl/SenderPubbmxxDaoImpl.java | 61 +
.../pubbmxx/entity/SenderPubbmxxEntity.java | 196 +++
.../pubbmxx/entity/SenderPubbmxxEntity.xml | 321 +++++
.../service/ISenderPubbmxxService.java | 78 ++
.../impl/SenderPubbmxxServiceImpl.java | 405 ++++++
.../pubkjqj/dao/ISenderPubkjqjDao.java | 88 ++
.../dao/impl/SenderPubkjqjDaoImpl.java | 62 +
.../pubkjqj/entity/SenderPubkjqjEntity.java | 134 ++
.../pubkjqj/entity/SenderPubkjqjEntity.xml | 249 ++++
.../service/ISenderPubkjqjService.java | 77 ++
.../impl/SenderPubkjqjServiceImpl.java | 419 ++++++
.../pubobjflow/dao/IPubObjFlowDao.java | 15 +
.../dao/impl/PubObjFlowDaoImpl.java | 18 +
.../pubobjflow/entity/PubObjFlowEntity.java | 132 ++
.../pubobjflow/entity/PubObjFlowEntity.xml | 87 ++
.../service/IPubObjFlowService.java | 11 +
.../service/impl/PubObjFlowServiceImpl.java | 15 +
.../pubzyxx/dao/ISenderPubzyxxDao.java | 90 ++
.../dao/impl/SenderPubzyxxDaoImpl.java | 61 +
.../pubzyxx/entity/SenderPubzyxxEntity.java | 395 ++++++
.../pubzyxx/entity/SenderPubzyxxEntity.xml | 549 ++++++++
.../service/ISenderPubzyxxService.java | 78 ++
.../impl/SenderPubzyxxServiceImpl.java | 394 ++++++
97 files changed, 18781 insertions(+)
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/dao/IGbiZbsyrecDao.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/dao/impl/GbiZbsyrecDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/entity/GbiZbsyrecEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/entity/GbiZbsyrecEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/service/IGbiZbsyrecService.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/service/impl/GbiZbsyrecServiceImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/ISenderGlPzmlDao.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/ISenderGlPzmlService.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/ISenderGlPznrDao.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/impl/SenderGlPznrDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/service/ISenderGlPznrService.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/service/impl/SenderGlPznrServiceImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/dao/ISenderGlYebDao.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/dao/impl/SenderGlYebDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/entity/SenderGlYebEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/entity/SenderGlYebEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/service/ISenderGlYebService.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/service/impl/SenderGlYebServiceImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/dao/ISenderGlZtcsDao.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/dao/impl/SenderGlZtcsDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/entity/SenderGlZtcsEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/entity/SenderGlZtcsEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/service/ISenderGlZtcsService.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/service/impl/SenderGlZtcsServiceImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/ISenderGlKmxxDao.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/impl/SenderGlKmxxDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/service/ISenderGlKmxxService.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/service/impl/SenderGlKmxxServiceImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/dao/ISenderGlXmzlDao.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/dao/impl/SenderGlXmzlDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/entity/SenderGlXmzlEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/entity/SenderGlXmzlEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/service/ISenderGlXmzlService.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/glxmzl/service/impl/SenderGlXmzlServiceImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/dao/IOerDjjsfsDao.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/dao/impl/OerDjjsfsDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/entity/OerDjjsfsEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/entity/OerDjjsfsEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/service/IOerDjjsfsService.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/service/impl/OerDjjsfsServiceImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/controller/OerDjmlController.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/dao/IOerDjmlDao.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/dao/impl/OerDjmlDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/IOerDjmlService.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlServiceImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/dao/IOerDjnrDao.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/dao/impl/OerDjnrDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/service/IOerDjnrService.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/service/impl/OerDjnrServiceImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/dao/IOerYszbDao.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/dao/impl/OerYszbDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/entity/OerYszbEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/entity/OerYszbEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/service/IOerYszbService.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/oeryszb/service/impl/OerYszbServiceImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/dao/IPubAuditLogDao.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/dao/impl/PubAuditLogDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/entity/PubAuditLogEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/entity/PubAuditLogEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/service/IPubAuditLogService.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubauditlog/service/impl/PubAuditLogServiceImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/dao/ISenderPubbmxxDao.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/dao/impl/SenderPubbmxxDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/entity/SenderPubbmxxEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/entity/SenderPubbmxxEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/service/ISenderPubbmxxService.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubbmxx/service/impl/SenderPubbmxxServiceImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/dao/ISenderPubkjqjDao.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/dao/impl/SenderPubkjqjDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/entity/SenderPubkjqjEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/entity/SenderPubkjqjEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/service/ISenderPubkjqjService.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubkjqj/service/impl/SenderPubkjqjServiceImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/dao/IPubObjFlowDao.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/dao/impl/PubObjFlowDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/entity/PubObjFlowEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/entity/PubObjFlowEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/service/IPubObjFlowService.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubobjflow/service/impl/PubObjFlowServiceImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/dao/ISenderPubzyxxDao.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/dao/impl/SenderPubzyxxDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/entity/SenderPubzyxxEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/entity/SenderPubzyxxEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/service/ISenderPubzyxxService.java
create mode 100644 service/src/main/java/com/hzya/frame/grpU8/nxproof/pubzyxx/service/impl/SenderPubzyxxServiceImpl.java
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/dao/IGbiZbsyrecDao.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/dao/IGbiZbsyrecDao.java
new file mode 100644
index 00000000..cbc18521
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/dao/IGbiZbsyrecDao.java
@@ -0,0 +1,15 @@
+package com.hzya.frame.grpU8.nxproof.gbizbsyrec.dao;
+
+
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.grpU8.nxproof.gbizbsyrec.entity.GbiZbsyrecEntity;
+
+/**
+ * @Author:hecan
+ * @Description:
+ * @params:
+ * @return:
+ * @Date: 2023/6/19 14:47
+ */
+public interface IGbiZbsyrecDao extends IBaseDao {
+}
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/dao/impl/GbiZbsyrecDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/dao/impl/GbiZbsyrecDaoImpl.java
new file mode 100644
index 00000000..bf5d7653
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/dao/impl/GbiZbsyrecDaoImpl.java
@@ -0,0 +1,17 @@
+package com.hzya.frame.grpU8.nxproof.gbizbsyrec.dao.impl;
+
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+import com.hzya.frame.grpU8.nxproof.gbizbsyrec.dao.IGbiZbsyrecDao;
+import com.hzya.frame.grpU8.nxproof.gbizbsyrec.entity.GbiZbsyrecEntity;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author:hecan
+ * @Description:
+ * @params:
+ * @return:
+ * @Date: 2023/6/19 14:48
+ */
+@Repository(value = "gbiZbsyrecDao")
+public class GbiZbsyrecDaoImpl extends MybatisGenericDao implements IGbiZbsyrecDao {
+}
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/entity/GbiZbsyrecEntity.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/entity/GbiZbsyrecEntity.java
new file mode 100644
index 00000000..4f20762f
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/entity/GbiZbsyrecEntity.java
@@ -0,0 +1,186 @@
+package com.hzya.frame.grpU8.nxproof.gbizbsyrec.entity;
+
+import com.hzya.frame.web.entity.BaseEntity;
+import lombok.*;
+
+/**
+ * @Author:hecan
+ * @Description:指标使用记录表
+ * @params:
+ * @return:
+ * @Date: 2023/6/16 22:04
+ */
+
+public class GbiZbsyrecEntity extends BaseEntity {
+ private String gsdm;//公司代码
+ private String kjnd;//会计年度
+ private String module;
+ private String djlx;
+ private String djId;
+ private String djflh;
+ private String djflmx;
+ private String djywrq;//单据日期
+ private String djzt;
+ private String jhId;//计划id
+ private String djje;//金额
+ private String sl;
+ private String djzy;//摘要
+ private String szfx;
+ private String zblb;
+ private String jdzb;
+ private String czlx;
+ private String zzbz;
+ private String ywdjId;
+
+ public String getGsdm() {
+ return gsdm;
+ }
+
+ public void setGsdm(String gsdm) {
+ this.gsdm = gsdm;
+ }
+
+ public String getKjnd() {
+ return kjnd;
+ }
+
+ public void setKjnd(String kjnd) {
+ this.kjnd = kjnd;
+ }
+
+ public String getModule() {
+ return module;
+ }
+
+ public void setModule(String module) {
+ this.module = module;
+ }
+
+ public String getDjlx() {
+ return djlx;
+ }
+
+ public void setDjlx(String djlx) {
+ this.djlx = djlx;
+ }
+
+ public String getDjId() {
+ return djId;
+ }
+
+ public void setDjId(String djId) {
+ this.djId = djId;
+ }
+
+ public String getDjflh() {
+ return djflh;
+ }
+
+ public void setDjflh(String djflh) {
+ this.djflh = djflh;
+ }
+
+ public String getDjflmx() {
+ return djflmx;
+ }
+
+ public void setDjflmx(String djflmx) {
+ this.djflmx = djflmx;
+ }
+
+ public String getDjywrq() {
+ return djywrq;
+ }
+
+ public void setDjywrq(String djywrq) {
+ this.djywrq = djywrq;
+ }
+
+ public String getDjzt() {
+ return djzt;
+ }
+
+ public void setDjzt(String djzt) {
+ this.djzt = djzt;
+ }
+
+ public String getJhId() {
+ return jhId;
+ }
+
+ public void setJhId(String jhId) {
+ this.jhId = jhId;
+ }
+
+ public String getDjje() {
+ return djje;
+ }
+
+ public void setDjje(String djje) {
+ this.djje = djje;
+ }
+
+ public String getSl() {
+ return sl;
+ }
+
+ public void setSl(String sl) {
+ this.sl = sl;
+ }
+
+ public String getDjzy() {
+ return djzy;
+ }
+
+ public void setDjzy(String djzy) {
+ this.djzy = djzy;
+ }
+
+ public String getSzfx() {
+ return szfx;
+ }
+
+ public void setSzfx(String szfx) {
+ this.szfx = szfx;
+ }
+
+ public String getZblb() {
+ return zblb;
+ }
+
+ public void setZblb(String zblb) {
+ this.zblb = zblb;
+ }
+
+ public String getJdzb() {
+ return jdzb;
+ }
+
+ public void setJdzb(String jdzb) {
+ this.jdzb = jdzb;
+ }
+
+ public String getCzlx() {
+ return czlx;
+ }
+
+ public void setCzlx(String czlx) {
+ this.czlx = czlx;
+ }
+
+ public String getZzbz() {
+ return zzbz;
+ }
+
+ public void setZzbz(String zzbz) {
+ this.zzbz = zzbz;
+ }
+
+ public String getYwdjId() {
+ return ywdjId;
+ }
+
+ public void setYwdjId(String ywdjId) {
+ this.ywdjId = ywdjId;
+ }
+}
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/entity/GbiZbsyrecEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/entity/GbiZbsyrecEntity.xml
new file mode 100644
index 00000000..a4bd5216
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/entity/GbiZbsyrecEntity.xml
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GSDM,KJND
+
+
+
+ select
+ *
+ from
+ GBI_ZBSYREC
+
+ GSDM = #{gsdm}
+ and KJND = #{kjnd}
+ and MODULE = #{module}
+ and DJLX = #{djlx}
+ and DJID =#{djId}
+ and DJFLH =#{djflh}
+ and DJFLMX =#{djflmx}
+ and DJYWRQ =#{djywrq}
+ and DJZT =#{djzt}
+ and JHID =#{jhId}
+ and DJJE =#{djje}
+ and SL =#{sl}
+ and DJZY =#{djzy}
+ and SZFX =#{szfx}
+ and ZBLB =#{zblb}
+ and JDBZ =#{jdzb}
+ and CZLX =#{czlx}
+ and ZZBZ =#{zzbz}
+ and YWDJID =#{ywdjId}
+
+
+
+
+
+ select
+ *
+ from
+ GBI_ZBSYREC
+ where DJID= #{djId}
+
+
+
+ insert into GBI_ZBSYREC(
+ YWDJID,
+ KJND,
+ MODULE,
+ DJLX,
+ DJID,
+ DJFLH,
+ DJFLMX,
+ DJYWRQ,
+ DJZT,
+ JHID,
+ DJJE ,
+ SL,
+ DJZY,
+ SZFX,
+ ZBLB,
+ JDBZ,
+ CZLX,
+ ZZBZ,
+ GSDM
+ )
+ values (
+ #{ywdjId},
+ #{kjnd},
+ #{module},
+ #{djlx},
+ #{djId},
+ #{djflh},
+ #{djflmx},
+ #{djywrq},
+ #{djzt},
+ #{jhId},
+ #{djje},
+ #{sl},
+ #{djzy},
+ #{szfx},
+ #{zblb},
+ #{jdzb},
+ #{czlx},
+ #{zzbz},
+ #{gsdm}
+ )
+
+
+
+ delete from GBI_ZBSYREC where KJND=#{kjnd} and DJID= #{djId}
+
+
+
+ delete FROM gbi_zbsyrec where GSDM =#{gsdm} and KJND=#{kjnd} and MODULE='GSP' and abs(DJFLMX)=${djflmx} AND DJJE > 0
+
+
+
+ delete FROM gbi_zbsyrec where GSDM =#{gsdm} and KJND=#{kjnd} and MODULE='OER' and djlx=#{djlx} and djid=#{djId} AND DJFLMX=#{djflmx}
+
+
+
+
+ DELETE
+ FROM
+ gbi_zbsyrec
+ WHERE
+ GSDM = #{gsdm}
+ AND KJND = #{kjnd}
+ AND (
+ (
+ MODULE = #{module}
+ AND DJFLMX = #{djflmx}
+ )
+ OR (
+ MODULE = #{module}
+ AND DJFLMX =#{djflmx}
+ )
+ );
+
+
+
+ DELETE
+ FROM
+ gbi_zbsyrec
+ WHERE
+ GSDM = #{gsdm}
+ AND KJND = #{kjnd}
+ AND (MODULE = #{module} OR MODULE = #{module})
+ AND abs(DJFLMX) = #{djflmx}
+
+
+
+
+ UPDATE GBI_ZBSYREC
+ SET DJZT = '1'
+ WHERE
+ GSDM = #{gsdm}
+ AND KJND = #{kjnd}
+ AND MODULE = #{module}
+ AND DJLX = #{djlx}
+ AND DJID = #{djId}
+ AND (DJFLMX = #{djflmx})
+
+
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/service/IGbiZbsyrecService.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/service/IGbiZbsyrecService.java
new file mode 100644
index 00000000..e4315904
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/service/IGbiZbsyrecService.java
@@ -0,0 +1,11 @@
+package com.hzya.frame.grpU8.nxproof.gbizbsyrec.service;
+
+/**
+ * @Author:hecan
+ * @Description:指标使用记录
+ * @params:
+ * @return:
+ * @Date: 2023/6/19 14:27
+ */
+public interface IGbiZbsyrecService {
+}
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/service/impl/GbiZbsyrecServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/service/impl/GbiZbsyrecServiceImpl.java
new file mode 100644
index 00000000..ebba6edc
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbsyrec/service/impl/GbiZbsyrecServiceImpl.java
@@ -0,0 +1,15 @@
+package com.hzya.frame.grpU8.nxproof.gbizbsyrec.service.impl;
+
+import com.hzya.frame.grpU8.nxproof.gbizbsyrec.service.IGbiZbsyrecService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author:hecan
+ * @Description:指标使用记录
+ * @params:
+ * @return:
+ * @Date: 2023/6/19 14:30
+ */
+@Service(value = "gbiZbsyrecService")
+public class GbiZbsyrecServiceImpl implements IGbiZbsyrecService {
+}
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/ISenderGlPzmlDao.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/ISenderGlPzmlDao.java
new file mode 100644
index 00000000..529198c9
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/ISenderGlPzmlDao.java
@@ -0,0 +1,89 @@
+package com.hzya.frame.grpU8.nxproof.glPzml.dao;
+
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.grpU8.nxproof.glPzml.entity.SenderGlPzmlEntity;
+
+import java.util.List;
+
+/**
+ * (gl_pzml: table)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-20 10:02:06
+ */
+public interface ISenderGlPzmlDao extends IBaseDao {
+
+ /**
+ *
+ * @content 查询凭证目录 卫生院
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/20 10:11
+ * **/
+ List querySenderGlPzmlEntity(SenderGlPzmlEntity senderGlPzmlEntity);
+
+ /**
+ *
+ * @content 保存凭证目录到凭证目录日志表中 卫生院
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/27 16:29
+ * **/
+ SenderGlPzmlEntity saveSenderGlPzmlEntity(SenderGlPzmlEntity senderGlPzmlEntity);
+
+ /**
+ *
+ * @content 更新凭证目录到凭证目录日志表中 卫生院
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/27 16:30
+ * **/
+ SenderGlPzmlEntity updateSenderGlPzmlEntity(SenderGlPzmlEntity senderGlPzmlEntity);
+
+ /**
+ *
+ * @content 查询凭证目录 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/20 10:11
+ * **/
+ List queryGlPzmlHealthBureau(SenderGlPzmlEntity senderGlPzmlEntity);
+
+ /**
+ *
+ * @content 保存凭证目录 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/27 16:29
+ * **/
+ SenderGlPzmlEntity saveGlPzmlHealthBureau(SenderGlPzmlEntity senderGlPzmlEntity);
+
+ /**
+ *
+ * @content 更新凭证目录 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/27 16:30
+ * **/
+ SenderGlPzmlEntity updateGlPzmlHealthBureau(SenderGlPzmlEntity senderGlPzmlEntity);
+
+ /**
+ *
+ * @content 删除凭证目录 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/8/9 17:44
+ * **/
+ Integer deleteGlPzmlHealthBureau(SenderGlPzmlEntity senderGlPzmlEntity);
+
+
+
+}
+
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
new file mode 100644
index 00000000..9b4655f7
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java
@@ -0,0 +1,64 @@
+package com.hzya.frame.grpU8.nxproof.glPzml.dao.impl;
+
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+import com.hzya.frame.grpU8.nxproof.glPzml.dao.ISenderGlPzmlDao;
+import com.hzya.frame.grpU8.nxproof.glPzml.entity.SenderGlPzmlEntity;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * (GlPzml)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-20 10:02:06
+ */
+@Repository(value = "SenderGlPzmlDaoImpl")
+public class SenderGlPzmlDaoImpl extends MybatisGenericDao implements ISenderGlPzmlDao {
+
+
+ @Override
+ @DS("#senderGlPzmlEntity.dataSourceCode")
+ public List querySenderGlPzmlEntity(SenderGlPzmlEntity senderGlPzmlEntity) {
+ return super.queryByLike(senderGlPzmlEntity);
+ }
+
+ @Override
+ @DS("#senderGlPzmlEntity.dataSourceCode")
+ public SenderGlPzmlEntity saveSenderGlPzmlEntity(SenderGlPzmlEntity senderGlPzmlEntity) {
+ return super.save(senderGlPzmlEntity);
+ }
+
+ @Override
+ @DS("#senderGlPzmlEntity.dataSourceCode")
+ public SenderGlPzmlEntity updateSenderGlPzmlEntity(SenderGlPzmlEntity senderGlPzmlEntity) {
+ return super.update(senderGlPzmlEntity);
+ }
+
+ @Override
+ @DS("#senderGlPzmlEntity.dataSourceCode")
+ public List queryGlPzmlHealthBureau(SenderGlPzmlEntity senderGlPzmlEntity) {
+ return super.query(senderGlPzmlEntity);
+ }
+
+ @Override
+ @DS("#senderGlPzmlEntity.dataSourceCode")
+ public SenderGlPzmlEntity saveGlPzmlHealthBureau(SenderGlPzmlEntity senderGlPzmlEntity) {
+ return super.save(senderGlPzmlEntity);
+ }
+
+ @Override
+ @DS("#senderGlPzmlEntity.dataSourceCode")
+ public SenderGlPzmlEntity updateGlPzmlHealthBureau(SenderGlPzmlEntity senderGlPzmlEntity) {
+ return super.update(senderGlPzmlEntity);
+ }
+
+ @Override
+ @DS("#senderGlPzmlEntity.dataSourceCode")
+ public Integer deleteGlPzmlHealthBureau(SenderGlPzmlEntity senderGlPzmlEntity) {
+ return super.delete("SenderGlPzmlEntity_delete_pzml",senderGlPzmlEntity);
+ }
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.java
new file mode 100644
index 00000000..bcaf3369
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.java
@@ -0,0 +1,371 @@
+package com.hzya.frame.grpU8.nxproof.glPzml.entity;
+
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/**
+ * (GlPzml)实体类
+ *
+ * @author makejava
+ * @since 2024-06-20 10:02:06
+ */
+public class SenderGlPzmlEntity extends BaseEntity {
+
+ private String gsdm;
+ private String zth;
+ private String kjqj;
+ private String pzly;
+ private String pzh;
+ private String pzrq;
+ private Integer fjzs;
+ private Integer srid;
+ private String sr;
+ private Integer shid;
+ private String sh;
+ private String jsr;
+ private Integer jzrid;
+ private String jzr;
+ private String srrq;
+ private String shrq;
+ private String jzrq;
+ private String pzhzkmdy;
+ private String pzhzbz;
+ private Integer zt;
+ private String pzzy;
+ private String pzje;
+ private String cn;
+ private String bz;
+ private String kjzg;
+ private String idpzh;
+ private String dyzt;
+ private String qzrq;
+ private Integer gdid;
+ private String gdname;
+ private String gdrqsj;
+ private Integer gdcs;
+ private String gdbz;
+ private Integer yspzzs;
+
+ private String kjtxdm;
+
+ private String pzlxdm;
+
+ private String pzsbm;
+ private String stamp;
+ private String yspzje;
+
+ public String getPzsbm() {
+ return pzsbm;
+ }
+
+ public void setPzsbm(String pzsbm) {
+ this.pzsbm = pzsbm;
+ }
+
+ public String getStamp() {
+ return stamp;
+ }
+
+ public void setStamp(String stamp) {
+ this.stamp = stamp;
+ }
+
+ public String getYspzje() {
+ return yspzje;
+ }
+
+ public void setYspzje(String yspzje) {
+ this.yspzje = yspzje;
+ }
+
+ public String getKjtxdm() {
+ return kjtxdm;
+ }
+
+ public void setKjtxdm(String kjtxdm) {
+ this.kjtxdm = kjtxdm;
+ }
+
+ public String getPzlxdm() {
+ return pzlxdm;
+ }
+
+ public void setPzlxdm(String pzlxdm) {
+ this.pzlxdm = pzlxdm;
+ }
+
+ public String getGsdm() {
+ return gsdm;
+ }
+
+ public void setGsdm(String gsdm) {
+ this.gsdm = gsdm;
+ }
+
+ public String getZth() {
+ return zth;
+ }
+
+ public void setZth(String zth) {
+ this.zth = zth;
+ }
+
+ public String getKjqj() {
+ return kjqj;
+ }
+
+ public void setKjqj(String kjqj) {
+ this.kjqj = kjqj;
+ }
+
+ public String getPzly() {
+ return pzly;
+ }
+
+ public void setPzly(String pzly) {
+ this.pzly = pzly;
+ }
+
+ public String getPzh() {
+ return pzh;
+ }
+
+ public void setPzh(String pzh) {
+ this.pzh = pzh;
+ }
+
+ public String getPzrq() {
+ return pzrq;
+ }
+
+ public void setPzrq(String pzrq) {
+ this.pzrq = pzrq;
+ }
+
+ public Integer getFjzs() {
+ return fjzs;
+ }
+
+ public void setFjzs(Integer fjzs) {
+ this.fjzs = fjzs;
+ }
+
+ public Integer getSrid() {
+ return srid;
+ }
+
+ public void setSrid(Integer srid) {
+ this.srid = srid;
+ }
+
+ public String getSr() {
+ return sr;
+ }
+
+ public void setSr(String sr) {
+ this.sr = sr;
+ }
+
+ public Integer getShid() {
+ return shid;
+ }
+
+ public void setShid(Integer shid) {
+ this.shid = shid;
+ }
+
+ public String getSh() {
+ return sh;
+ }
+
+ public void setSh(String sh) {
+ this.sh = sh;
+ }
+
+ public String getJsr() {
+ return jsr;
+ }
+
+ public void setJsr(String jsr) {
+ this.jsr = jsr;
+ }
+
+ public Integer getJzrid() {
+ return jzrid;
+ }
+
+ public void setJzrid(Integer jzrid) {
+ this.jzrid = jzrid;
+ }
+
+ public String getJzr() {
+ return jzr;
+ }
+
+ public void setJzr(String jzr) {
+ this.jzr = jzr;
+ }
+
+ public String getSrrq() {
+ return srrq;
+ }
+
+ public void setSrrq(String srrq) {
+ this.srrq = srrq;
+ }
+
+ public String getShrq() {
+ return shrq;
+ }
+
+ public void setShrq(String shrq) {
+ this.shrq = shrq;
+ }
+
+ public String getJzrq() {
+ return jzrq;
+ }
+
+ public void setJzrq(String jzrq) {
+ this.jzrq = jzrq;
+ }
+
+ public String getPzhzkmdy() {
+ return pzhzkmdy;
+ }
+
+ public void setPzhzkmdy(String pzhzkmdy) {
+ this.pzhzkmdy = pzhzkmdy;
+ }
+
+ public String getPzhzbz() {
+ return pzhzbz;
+ }
+
+ public void setPzhzbz(String pzhzbz) {
+ this.pzhzbz = pzhzbz;
+ }
+
+ public Integer getZt() {
+ return zt;
+ }
+
+ public void setZt(Integer zt) {
+ this.zt = zt;
+ }
+
+ public String getPzzy() {
+ return pzzy;
+ }
+
+ public void setPzzy(String pzzy) {
+ this.pzzy = pzzy;
+ }
+
+ public String getPzje() {
+ return pzje;
+ }
+
+ public void setPzje(String pzje) {
+ this.pzje = pzje;
+ }
+
+ public String getCn() {
+ return cn;
+ }
+
+ public void setCn(String cn) {
+ this.cn = cn;
+ }
+
+ public String getBz() {
+ return bz;
+ }
+
+ public void setBz(String bz) {
+ this.bz = bz;
+ }
+
+ public String getKjzg() {
+ return kjzg;
+ }
+
+ public void setKjzg(String kjzg) {
+ this.kjzg = kjzg;
+ }
+
+ public String getIdpzh() {
+ return idpzh;
+ }
+
+ public void setIdpzh(String idpzh) {
+ this.idpzh = idpzh;
+ }
+
+ public String getDyzt() {
+ return dyzt;
+ }
+
+ public void setDyzt(String dyzt) {
+ this.dyzt = dyzt;
+ }
+
+ public String getQzrq() {
+ return qzrq;
+ }
+
+ public void setQzrq(String qzrq) {
+ this.qzrq = qzrq;
+ }
+
+ public Integer getGdid() {
+ return gdid;
+ }
+
+ public void setGdid(Integer gdid) {
+ this.gdid = gdid;
+ }
+
+ public String getGdname() {
+ return gdname;
+ }
+
+ public void setGdname(String gdname) {
+ this.gdname = gdname;
+ }
+
+ public String getGdrqsj() {
+ return gdrqsj;
+ }
+
+ public void setGdrqsj(String gdrqsj) {
+ this.gdrqsj = gdrqsj;
+ }
+
+ public Integer getGdcs() {
+ return gdcs;
+ }
+
+ public void setGdcs(Integer gdcs) {
+ this.gdcs = gdcs;
+ }
+
+ public String getGdbz() {
+ return gdbz;
+ }
+
+ public void setGdbz(String gdbz) {
+ this.gdbz = gdbz;
+ }
+
+ public Integer getYspzzs() {
+ return yspzzs;
+ }
+
+ public void setYspzzs(Integer yspzzs) {
+ this.yspzzs = yspzzs;
+ }
+
+
+}
+
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
new file mode 100644
index 00000000..86d48292
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml
@@ -0,0 +1,511 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ gsdm
+ , ZTH
+ , kjqj
+ , pzly
+ ,pzlxdm
+ ,kjtxdm
+ , pzh
+ , pzrq
+ , fjzs
+ , srID
+ , sr
+ , shID
+ , sh
+ , jsr
+ , jzrID
+ , jzr
+ , srrq
+ , shrq
+ , jzrq
+ , pzhzkmdy
+ , pzhzbz
+ , zt
+ , pzzy
+ , pzje
+ , CN
+ , BZ
+ , kjzg
+ , idpzh
+ , dyzt
+ , QZRQ
+ , GDID
+ , GDName
+ , GDRQSJ
+ , GDCS
+ , GDBZ
+ , yspzzs
+ , pzsbm
+ , stamp
+ , yspzje
+
+
+
+ select
+
+ from gl_pzml
+
+ and gsdm = #{gsdm}
+ and ZTH = #{zth}
+ and kjqj = #{kjqj}
+ and pzly = #{pzly}
+ and pzh = #{pzh}
+ and pzrq >= #{pzrq}
+ and fjzs = #{fjzs}
+ and srID = #{srid}
+ and sr = #{sr}
+ and shID = #{shid}
+ and sh = #{sh}
+ and jsr = #{jsr}
+ and jzrID = #{jzrid}
+ and jzr = #{jzr}
+ and srrq = #{srrq}
+ and shrq = #{shrq}
+ and jzrq = #{jzrq}
+ and pzhzkmdy = #{pzhzkmdy}
+ and pzhzbz = #{pzhzbz}
+ and zt = #{zt}
+ and pzzy = #{pzzy}
+ and pzje = #{pzje}
+ and CN = #{cn}
+ and BZ = #{bz}
+ and kjzg = #{kjzg}
+ and idpzh = #{idpzh}
+ and dyzt = #{dyzt}
+ and QZRQ = #{qzrq}
+ and GDID = #{gdid}
+ and GDName = #{gdname}
+ and GDRQSJ = #{gdrqsj}
+ and GDCS = #{gdcs}
+ and GDBZ = #{gdbz}
+ and yspzzs = #{yspzzs}
+ and pzsbm = #{pzsbm}
+ and stamp = #{stamp}
+ and yspzje = #{yspzje}
+ -- and zth in('004','005','009','010','011','012','014')
+
+
+
+
+
+ select count(1) from gl_pzml
+
+ and gsdm = #{gsdm}
+ and ZTH = #{zth}
+ and kjqj = #{kjqj}
+ and pzly = #{pzly}
+ and pzh = #{pzh}
+ and pzrq = #{pzrq}
+ and fjzs = #{fjzs}
+ and srID = #{srid}
+ and sr = #{sr}
+ and shID = #{shid}
+ and sh = #{sh}
+ and jsr = #{jsr}
+ and jzrID = #{jzrid}
+ and jzr = #{jzr}
+ and srrq = #{srrq}
+ and shrq = #{shrq}
+ and jzrq = #{jzrq}
+ and pzhzkmdy = #{pzhzkmdy}
+ and pzhzbz = #{pzhzbz}
+ and zt = #{zt}
+ and pzzy = #{pzzy}
+ and pzje = #{pzje}
+ and CN = #{cn}
+ and BZ = #{bz}
+ and kjzg = #{kjzg}
+ and idpzh = #{idpzh}
+ and dyzt = #{dyzt}
+ and QZRQ = #{qzrq}
+ and GDID = #{gdid}
+ and GDName = #{gdname}
+ and GDRQSJ = #{gdrqsj}
+ and GDCS = #{gdcs}
+ and GDBZ = #{gdbz}
+ and yspzzs = #{yspzzs}
+
+
+
+
+
+ select
+
+ from gl_pzml
+
+ and gsdm like concat('%',#{gsdm},'%')
+ and ZTH like concat('%',#{zth},'%')
+ and kjqj like concat('%',#{kjqj},'%')
+ and pzly like concat('%',#{pzly},'%')
+ and pzh like concat('%',#{pzh},'%')
+ and pzrq like concat('%',#{pzrq},'%')
+ and fjzs like concat('%',#{fjzs},'%')
+ and srID like concat('%',#{srid},'%')
+ and sr like concat('%',#{sr},'%')
+ and shID like concat('%',#{shid},'%')
+ and sh like concat('%',#{sh},'%')
+ and jsr like concat('%',#{jsr},'%')
+ and jzrID like concat('%',#{jzrid},'%')
+ and jzr like concat('%',#{jzr},'%')
+ and srrq like concat('%',#{srrq},'%')
+ and shrq like concat('%',#{shrq},'%')
+ and jzrq like concat('%',#{jzrq},'%')
+ and pzhzkmdy like concat('%',#{pzhzkmdy},'%')
+ and pzhzbz like concat('%',#{pzhzbz},'%')
+ and zt like concat('%',#{zt},'%')
+ and pzzy like concat('%',#{pzzy},'%')
+ and pzje like concat('%',#{pzje},'%')
+ and CN like concat('%',#{cn},'%')
+ and BZ like concat('%',#{bz},'%')
+ and kjzg like concat('%',#{kjzg},'%')
+ and idpzh like concat('%',#{idpzh},'%')
+ and dyzt like concat('%',#{dyzt},'%')
+ and QZRQ like concat('%',#{qzrq},'%')
+ and GDID like concat('%',#{gdid},'%')
+ and GDName like concat('%',#{gdname},'%')
+ and GDRQSJ like concat('%',#{gdrqsj},'%')
+ and GDCS like concat('%',#{gdcs},'%')
+ and GDBZ like concat('%',#{gdbz},'%')
+ and yspzzs like concat('%',#{yspzzs},'%')
+
+
+
+
+
+ select
+
+ from gl_pzml
+
+ or gsdm = #{gsdm}
+ or ZTH = #{zth}
+ or kjqj = #{kjqj}
+ or pzly = #{pzly}
+ or pzh = #{pzh}
+ or pzrq = #{pzrq}
+ or fjzs = #{fjzs}
+ or srID = #{srid}
+ or sr = #{sr}
+ or shID = #{shid}
+ or sh = #{sh}
+ or jsr = #{jsr}
+ or jzrID = #{jzrid}
+ or jzr = #{jzr}
+ or srrq = #{srrq}
+ or shrq = #{shrq}
+ or jzrq = #{jzrq}
+ or pzhzkmdy = #{pzhzkmdy}
+ or pzhzbz = #{pzhzbz}
+ or zt = #{zt}
+ or pzzy = #{pzzy}
+ or pzje = #{pzje}
+ or CN = #{cn}
+ or BZ = #{bz}
+ or kjzg = #{kjzg}
+ or idpzh = #{idpzh}
+ or dyzt = #{dyzt}
+ or QZRQ = #{qzrq}
+ or GDID = #{gdid}
+ or GDName = #{gdname}
+ or GDRQSJ = #{gdrqsj}
+ or GDCS = #{gdcs}
+ or GDBZ = #{gdbz}
+ or yspzzs = #{yspzzs}
+
+
+
+
+
+ insert into gl_pzml(
+
+ gsdm ,
+ kjqj ,
+ pzly ,
+ pzh ,
+ kjtxdm ,
+ pzlxdm ,
+ pzrq ,
+ fjzs ,
+ srID ,
+ sr ,
+ shID ,
+ sh ,
+ jsr ,
+ jzrID ,
+ jzr ,
+ srrq ,
+ shrq ,
+ jzrq ,
+ pzhzkmdy ,
+ pzhzbz ,
+ zt ,
+ pzzy ,
+ pzje ,
+ CN ,
+ BZ ,
+ kjzg ,
+ idpzh ,
+ dyzt ,
+ QZRQ ,
+ GDID ,
+ GDName ,
+ GDRQSJ ,
+ GDCS ,
+ GDBZ ,
+ yspzzs ,
+ pzsbm,
+ stamp,
+ yspzje,
+ ZTH
+
+ )values(
+
+ #{gsdm} ,
+ #{kjqj} ,
+ #{pzly} ,
+ #{pzh} ,
+ #{kjtxdm} ,
+ #{pzlxdm} ,
+ #{pzrq} ,
+ #{fjzs} ,
+ #{srid} ,
+ #{sr} ,
+ #{shid} ,
+ #{sh} ,
+ #{jsr} ,
+ #{jzrid} ,
+ #{jzr} ,
+ #{srrq} ,
+ #{shrq} ,
+ #{jzrq} ,
+ #{pzhzkmdy} ,
+ #{pzhzbz} ,
+ #{zt} ,
+ #{pzzy} ,
+ #{pzje} ,
+ #{cn} ,
+ #{bz} ,
+ #{kjzg} ,
+ #{idpzh} ,
+ #{dyzt} ,
+ #{qzrq} ,
+ #{gdid} ,
+ #{gdname} ,
+ #{gdrqsj} ,
+ #{gdcs} ,
+ #{gdbz} ,
+ #{yspzzs} ,
+ #{pzsbm},
+ #{stamp},
+ #{yspzje},
+ #{zth}
+
+ )
+
+
+
+
+
+
+ insert into gl_pzml(gsdm, ZTH, kjqj, pzly, pzh, pzrq, fjzs, srID, sr, shID, sh, jsr, jzrID, jzr, srrq, shrq, jzrq, pzhzkmdy, pzhzbz, zt, pzzy, pzje, CN, BZ, kjzg, idpzh, dyzt, QZRQ, GDID, GDName, GDRQSJ, GDCS, GDBZ, yspzzs)
+ values
+
+ (#{entity.gsdm},#{entity.zth},#{entity.kjqj},#{entity.pzly},#{entity.pzh},#{entity.pzrq},#{entity.fjzs},#{entity.srid},#{entity.sr},#{entity.shid},#{entity.sh},#{entity.jsr},#{entity.jzrid},#{entity.jzr},#{entity.srrq},#{entity.shrq},#{entity.jzrq},#{entity.pzhzkmdy},#{entity.pzhzbz},#{entity.zt},#{entity.pzzy},#{entity.pzje},#{entity.cn},#{entity.bz},#{entity.kjzg},#{entity.idpzh},#{entity.dyzt},#{entity.qzrq},#{entity.gdid},#{entity.gdname},#{entity.gdrqsj},#{entity.gdcs},#{entity.gdbz},#{entity.yspzzs})
+
+
+
+
+ insert into gl_pzml(gsdm, ZTH, kjqj, pzly, pzh, pzrq, fjzs, srID, sr, shID, sh, jsr, jzrID, jzr, srrq, shrq, jzrq, pzhzkmdy, pzhzbz, zt, pzzy, pzje, CN, BZ, kjzg, idpzh, dyzt, QZRQ, GDID, GDName, GDRQSJ, GDCS, GDBZ, yspzzs)
+ values
+
+ (#{entity.gsdm},#{entity.zth},#{entity.kjqj},#{entity.pzly},#{entity.pzh},#{entity.pzrq},#{entity.fjzs},#{entity.srid},#{entity.sr},#{entity.shid},#{entity.sh},#{entity.jsr},#{entity.jzrid},#{entity.jzr},#{entity.srrq},#{entity.shrq},#{entity.jzrq},#{entity.pzhzkmdy},#{entity.pzhzbz},#{entity.zt},#{entity.pzzy},#{entity.pzje},#{entity.cn},#{entity.bz},#{entity.kjzg},#{entity.idpzh},#{entity.dyzt},#{entity.qzrq},#{entity.gdid},#{entity.gdname},#{entity.gdrqsj},#{entity.gdcs},#{entity.gdbz},#{entity.yspzzs})
+
+ on duplicate key update
+ gsdm = values(gsdm),
+ ZTH = values(ZTH),
+ kjqj = values(kjqj),
+ pzly = values(pzly),
+ pzh = values(pzh),
+ pzrq = values(pzrq),
+ fjzs = values(fjzs),
+ srID = values(srID),
+ sr = values(sr),
+ shID = values(shID),
+ sh = values(sh),
+ jsr = values(jsr),
+ jzrID = values(jzrID),
+ jzr = values(jzr),
+ srrq = values(srrq),
+ shrq = values(shrq),
+ jzrq = values(jzrq),
+ pzhzkmdy = values(pzhzkmdy),
+ pzhzbz = values(pzhzbz),
+ zt = values(zt),
+ pzzy = values(pzzy),
+ pzje = values(pzje),
+ CN = values(CN),
+ BZ = values(BZ),
+ kjzg = values(kjzg),
+ idpzh = values(idpzh),
+ dyzt = values(dyzt),
+ QZRQ = values(QZRQ),
+ GDID = values(GDID),
+ GDName = values(GDName),
+ GDRQSJ = values(GDRQSJ),
+ GDCS = values(GDCS),
+ GDBZ = values(GDBZ),
+ yspzzs = values(yspzzs)
+
+
+ update gl_pzml set
+
+ gsdm = #{gsdm},
+ ZTH = #{zth},
+ kjqj = #{kjqj},
+ pzly = #{pzly},
+ pzh = #{pzh},
+ kjtxdm = #{kjtxdm},
+ pzlxdm = #{pzlxdm},
+ pzrq = #{pzrq},
+ fjzs = #{fjzs},
+ srID = #{srid},
+ sr = #{sr},
+ shID = #{shid},
+ sh = #{sh},
+ jsr = #{jsr},
+ jzrID = #{jzrid},
+ jzr = #{jzr},
+ srrq = #{srrq},
+ shrq = #{shrq},
+ jzrq = #{jzrq},
+ pzhzkmdy = #{pzhzkmdy},
+ pzhzbz = #{pzhzbz},
+ zt = #{zt},
+ pzzy = #{pzzy},
+ pzje = #{pzje},
+ CN = #{cn},
+ BZ = #{bz},
+ kjzg = #{kjzg},
+ dyzt = #{dyzt},
+ QZRQ = #{qzrq},
+ GDID = #{gdid},
+ GDName = #{gdname},
+ GDRQSJ = #{gdrqsj},
+ GDCS = #{gdcs},
+ GDBZ = #{gdbz},
+ yspzzs = #{yspzzs},
+ pzsbm = #{pzsbm},
+ stamp = #{stamp},
+ yspzje = #{yspzje}
+
+ where idpzh= #{idpzh}
+
+
+
+
+
+update gl_pzml set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+where idpzh= #{idpzh}
+
+
+
+update gl_pzml set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+
+ and gsdm = #{gsdm}
+ and ZTH = #{zth}
+ and kjqj = #{kjqj}
+ and pzly = #{pzly}
+ and pzh = #{pzh}
+ and kjtxdm = #{kjtxdm}
+ and pzh = #{pzlxdm}
+ and pzrq = #{pzrq}
+ and fjzs = #{fjzs}
+ and srID = #{srid}
+ and sr = #{sr}
+ and shID = #{shid}
+ and sh = #{sh}
+ and jsr = #{jsr}
+ and jzrID = #{jzrid}
+ and jzr = #{jzr}
+ and srrq = #{srrq}
+ and shrq = #{shrq}
+ and jzrq = #{jzrq}
+ and pzhzkmdy = #{pzhzkmdy}
+ and pzhzbz = #{pzhzbz}
+ and zt = #{zt}
+ and pzzy = #{pzzy}
+ and pzje = #{pzje}
+ and CN = #{cn}
+ and BZ = #{bz}
+ and kjzg = #{kjzg}
+ and dyzt = #{dyzt}
+ and QZRQ = #{qzrq}
+ and GDID = #{gdid}
+ and GDName = #{gdname}
+ and GDRQSJ = #{gdrqsj}
+ and GDCS = #{gdcs}
+ and GDBZ = #{gdbz}
+ and yspzzs = #{yspzzs}
+ and sts='Y'
+
+
+
+
+ delete from gl_pzml where idpzh= #{idpzh}
+
+
+
+
+ delete from gl_pzml where gsdm= #{gsdm} and zth=#{zth}
+ and kjqj=#{kjqj}
+ and pzh = #{pzh}
+ and idpzh = #{idpzh}
+
+
+
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/ISenderGlPzmlService.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/ISenderGlPzmlService.java
new file mode 100644
index 00000000..f48e4838
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/ISenderGlPzmlService.java
@@ -0,0 +1,96 @@
+package com.hzya.frame.grpU8.nxproof.glPzml.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.grpU8.nxproof.glPzml.entity.SenderGlPzmlEntity;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+/**
+ * (GlPzml)表服务接口
+ *
+ * @author makejava
+ * @since 2024-06-20 10:02:06
+ */
+public interface ISenderGlPzmlService extends IBaseService {
+
+ /**
+ *
+ * @content 同步凭证 卫生院
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/20 14:36
+ * **/
+ void glPzmlSynchronization(JSONObject jsonObject);
+
+ /**
+ *
+ * @content 查询凭证 卫生院
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/20 18:38
+ * **/
+ JsonResultEntity queryEntityPage(JSONObject jsonObject);
+
+ /**
+ *
+ * @content 保存凭证到凭证日志表中 卫生院
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/21 14:33
+ * **/
+ JsonResultEntity saveEntity(JSONObject jsonObject);
+
+ /**
+ *
+ * @content 更新凭证到凭证日志表中 卫生院
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/21 14:34
+ * **/
+ JsonResultEntity updateEntity(JSONObject jsonObject);
+
+ /**
+ *
+ * @content 查询凭证 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/20 18:38
+ * **/
+ JsonResultEntity queryEntityPageHealthBureau(JSONObject jsonObject);
+
+ /**
+ *
+ * @content 保存凭证 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/21 14:33
+ * **/
+ JsonResultEntity saveEntityHealthBureau(JSONObject jsonObject);
+
+ /**
+ *
+ * @content 更新凭证 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/21 14:34
+ * **/
+ JsonResultEntity updateEntityHealthBureau(JSONObject jsonObject);
+
+ /**
+ *
+ * @content 删除凭证 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/8/9 17:46
+ * **/
+ JsonResultEntity deleteEntityHealthBureau(JSONObject jsonObject);
+
+}
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
new file mode 100644
index 00000000..1098334e
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java
@@ -0,0 +1,668 @@
+package com.hzya.frame.grpU8.nxproof.glPzml.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.basedao.service.impl.BaseService;
+import com.hzya.frame.grpU8.nxproof.glPzml.dao.ISenderGlPzmlDao;
+import com.hzya.frame.grpU8.nxproof.glPzml.entity.SenderGlPzmlEntity;
+import com.hzya.frame.grpU8.nxproof.glPzml.service.ISenderGlPzmlService;
+import com.hzya.frame.grpU8.nxproof.glPznr.dao.ISenderGlPznrDao;
+import com.hzya.frame.grpU8.nxproof.glPznr.entity.SenderGlPznrEntity;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.apache.commons.collections.CollectionUtils;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * (GlPzml)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-06-20 10:02:06
+ */
+@Service(value = "SenderGlPzmlServiceImpl")
+public class SenderGlPzmlServiceImpl extends BaseService implements ISenderGlPzmlService {
+
+
+
+ private ISenderGlPzmlDao senderGlPzmlDao;
+
+ @Autowired
+ public void setSenderGlPzmlDao(ISenderGlPzmlDao dao) {
+ this.senderGlPzmlDao = dao;
+ this.dao = dao;
+ }
+
+ @Autowired
+ private ISenderGlPznrDao senderGlPznrDao;
+
+
+ //凭证同步
+ @Override
+ public void glPzmlSynchronization(JSONObject json) {
+ SenderGlPzmlEntity senderGlPzmlEntity = json.toJavaObject(SenderGlPzmlEntity.class);
+ String result=null;
+ try {
+ //如果没有传入年度,则查询当年得,避免数据查询太大
+ if (senderGlPzmlEntity.getKjqj() == null) {
+ senderGlPzmlEntity.setKjqj(DateUtil.format(new Date(),"yyyy"));
+ //senderGlPzmlEntity.setKjqj("202105");
+ }
+ JSONObject jsonObjectStr=new JSONObject();
+ /*try {
+ //同步南浔区人民医院001凭证信息
+ senderGlPzmlEntity.setZth("001");
+ senderGlPzmlEntity.setGsdm("0101010101");
+ logger.info("===========开始查询南浔区人民医院凭证目录信息=============");
+ jsonObjectStr.put("jsonStr",senderGlPzmlEntity);
+ result=sendPzmlToHealthBureau(jsonObjectStr);
+ logger.info("南浔区人民医院GRPU8凭证同步结果为:{}",result);
+ }catch (Exception e){
+ logger.info("南浔区人民医院GRPU8凭证同步失败:{}",e.getMessage());
+ e.printStackTrace();
+ }*/
+ try {
+ //同步南浔区练市人民医院003凭证信息
+ senderGlPzmlEntity.setZth("003");
+ senderGlPzmlEntity.setGsdm("0101010103");
+ logger.info("===========开始查询南浔区练市人民医院凭证目录信息=============");
+ jsonObjectStr.put("jsonStr",senderGlPzmlEntity);
+ result=sendPzmlToHealthBureau(jsonObjectStr);
+ logger.info("南浔区练市人民医院GRPU8凭证同步结果为:{}",result);
+ }catch (Exception e){
+ logger.info("南浔区练市人民医院GRPU8凭证同步失败:{}",e.getMessage());
+ e.printStackTrace();
+ }
+ /*try {
+ //同步练市镇中心卫生院005凭证信息
+ senderGlPzmlEntity.setZth("005");
+ senderGlPzmlEntity.setGsdm("0101010202");
+ logger.info("===========开始查询南浔区练市镇中心卫生院凭证目录信息=============");
+ jsonObjectStr.put("jsonStr",senderGlPzmlEntity);
+ result=sendPzmlToHealthBureau(jsonObjectStr);
+ logger.info("南浔区练市镇中心卫生院GRPU8凭证同步结果为:{}",result);
+ }catch (Exception e){
+ logger.info("南浔区练市镇中心卫生院GRPU8凭证同步失败:{}",e.getMessage());
+ e.printStackTrace();
+ }*/
+ /*try {
+ //同步善琏镇卫生院007凭证信息
+ senderGlPzmlEntity.setZth("007");
+ senderGlPzmlEntity.setGsdm("0101010204");
+ logger.info("===========开始查询南浔区善琏镇卫生院凭证目录信息=============");
+ jsonObjectStr.put("jsonStr",senderGlPzmlEntity);
+ result=sendPzmlToHealthBureau(jsonObjectStr);
+ logger.info("南浔区善琏镇卫生院GRPU8凭证同步结果为:{}",result);
+ }catch (Exception e){
+ logger.info("南浔区善琏镇卫生院GRPU8凭证同步失败:{}",e.getMessage());
+ e.printStackTrace();
+ }*/
+ /*//同步双林镇中心卫生院004凭证信息
+ senderGlPzmlEntity.setZth("004");
+ senderGlPzmlEntity.setGsdm("0101010201");
+ jsonObjectStr.put("jsonStr",senderGlPzmlEntity);
+ result=sendPzmlToHealthBureau(jsonObjectStr);
+ logger.info("双林镇中心卫生院GRPU8凭证同步结果为:{}",result);
+ //同步菱湖镇中心卫生院009凭证信息
+ senderGlPzmlEntity.setZth("009");
+ senderGlPzmlEntity.setGsdm("0101020201");
+ jsonObjectStr.put("jsonStr",senderGlPzmlEntity);
+ result=sendPzmlToHealthBureau(jsonObjectStr);
+ logger.info("菱湖镇中心卫生院GRPU8凭证同步结果为:{}",result);
+ //同步和孚镇卫生院010凭证信息
+ senderGlPzmlEntity.setZth("010");
+ senderGlPzmlEntity.setGsdm("0101020202");
+ jsonObjectStr.put("jsonStr",senderGlPzmlEntity);
+ result=sendPzmlToHealthBureau(jsonObjectStr);
+ logger.info("和孚镇卫生院GRPU8凭证同步结果为:{}",result);
+ //同步千金镇卫生院011凭证信息
+ senderGlPzmlEntity.setZth("011");
+ senderGlPzmlEntity.setGsdm("0101020203");
+ jsonObjectStr.put("jsonStr",senderGlPzmlEntity);
+ result=sendPzmlToHealthBureau(jsonObjectStr);
+ logger.info("千金镇卫生院GRPU8凭证同步结果为:{}",result);
+ //同步石崇镇卫生院012凭证信息
+ senderGlPzmlEntity.setZth("012");
+ senderGlPzmlEntity.setGsdm("0101020204");
+ jsonObjectStr.put("jsonStr",senderGlPzmlEntity);
+ result=sendPzmlToHealthBureau(jsonObjectStr);
+ logger.info("石崇镇卫生院GRPU8凭证同步结果为:{}");
+ //同步南浔镇中心卫生院014凭证信息
+ senderGlPzmlEntity.setZth("014");
+ senderGlPzmlEntity.setGsdm("010202");
+ jsonObjectStr.put("jsonStr",senderGlPzmlEntity);
+ result=sendPzmlToHealthBureau(jsonObjectStr);
+ logger.info("南浔镇中心卫生院GRPU8凭证同步结果为:{}",result);*/
+ } catch (Exception e) {
+ logger.info("GRPU8凭证同步失败:{}", e.getMessage());
+ e.printStackTrace();
+ }
+ }
+
+ private String sendPzmlToHealthBureau(JSONObject jsonObjectStr){
+ JsonResultEntity jsonResultEntity = queryEntityPage(jsonObjectStr);
+ if (jsonResultEntity.getAttribute() == null) {
+ logger.info("GRPU8没有需要同步得凭证目录信息信息");
+ return "GRPU8没有需要同步的凭证目录信息";
+ }
+ JSONArray jsonArray = (JSONArray) JSON.toJSON(jsonResultEntity.getAttribute());
+ if (CollectionUtils.isEmpty(jsonArray)) {
+ logger.info("GRPU8没有需要同步得凭证目录信息信息");
+ return "GRPU8没有需要同步的凭证目录信息";
+ } else {
+ for (Object o : jsonArray) {
+ JSONObject jsonObjectPz = (JSONObject) JSON.toJSON(o);
+ //获取凭证目录信息
+ JSONObject jsonObjectPzml = jsonObjectPz.getJSONObject("gl_pzml");
+ JSONArray jsonArrayPznr = jsonObjectPz.getJSONArray("gl_pznr");
+ SenderGlPzmlEntity receiverGlPzmlEntity = new SenderGlPzmlEntity();
+ receiverGlPzmlEntity.setIdpzh(jsonObjectPzml.getString("idpzh"));
+ receiverGlPzmlEntity.setZth(jsonObjectPzml.getString("zth"));
+ JSONObject jsonObjectReceiver = new JSONObject();
+ jsonObjectReceiver.put("jsonStr", receiverGlPzmlEntity);
+ //根据发送方的idpzh查询接收方中是否存在数据
+ JsonResultEntity jsonResultEntityReceiver = queryEntityPageHealthBureau(jsonObjectReceiver);
+ JsonResultEntity jsonResultEntityRec=null;
+ //如果从接收方查询出的凭证没有,则新增,如果有,则更新凭证目录,之后再比较明细,如果接收方明细不存在,则新增明细,否则更新明细
+ if (jsonResultEntityReceiver.getAttribute() == null && jsonResultEntityReceiver.isFlag()) {
+ JSONObject jsonReceiverSave = new JSONObject();
+ jsonReceiverSave.put("main", jsonObjectPzml);
+ jsonReceiverSave.put("details", jsonArrayPznr);
+ jsonReceiverSave.put("kjqj", jsonObjectPzml.getString("kjqj"));
+ jsonReceiverSave.put("gsdm", jsonObjectPzml.getString("gsdm"));
+ jsonReceiverSave.put("zth", jsonObjectPzml.getString("zth"));
+ jsonReceiverSave.put("pzh", jsonObjectPzml.getString("pzh"));
+ JSONObject jsonObjectPznrStr = new JSONObject();
+ jsonObjectPznrStr.put("jsonStr", jsonReceiverSave);
+ jsonResultEntityRec= saveEntityHealthBureau(jsonObjectPznrStr);
+ if(jsonResultEntityRec.isFlag()){
+ JSONObject json = (JSONObject) JSONObject.toJSON(jsonResultEntityRec.getAttribute());
+ logger.info("账套号:{}的GROU8得凭证同步保存卫生局的返回结果为:{}", jsonObjectPzml.getString("zth"),json.toJSONString());
+ }
+ /* if(jsonResultEntityReceiverSave.getStatus().equals("200")&&jsonResultEntityReceiverSave.getAttribute()!=null){
+ //保存日志
+ saveEntity(jsonObjectPznrStr);
+ }*/
+ } else {
+ JSONArray jsonArrayResult = (JSONArray) JSON.toJSON(jsonResultEntityReceiver.getAttribute());
+ //有值 将发送方的数据更新到接收方 更新凭证目录,更新凭证内容
+ for (Object object : jsonArrayResult) {
+ JSONObject jsonObjectReceiverPz = (JSONObject) JSON.toJSON(object);
+ //获取凭证目录信息
+ JSONObject jsonObjectReceiverPzml = jsonObjectReceiverPz.getJSONObject("main");
+ //JSONArray jsonArrayReceiverPznr = jsonObjectReceiverPz.getJSONArray("details");
+ if (jsonObjectPzml.getString("idpzh").equals(jsonObjectReceiverPzml.getString("idpzh"))) {
+ JSONObject jsonReceiverUpdate = new JSONObject();
+ jsonReceiverUpdate.put("main", jsonObjectPzml);
+ jsonReceiverUpdate.put("details", jsonArrayPznr);
+ jsonReceiverUpdate.put("kjqj", jsonObjectPzml.getString("kjqj"));
+ jsonReceiverUpdate.put("gsdm", jsonObjectPzml.getString("gsdm"));
+ jsonReceiverUpdate.put("zth", jsonObjectPzml.getString("zth"));
+ jsonReceiverUpdate.put("pzh", jsonObjectPzml.getString("pzh"));
+ JSONObject jsonObjectPznrStr = new JSONObject();
+ jsonObjectPznrStr.put("jsonStr", jsonReceiverUpdate);
+ jsonResultEntityRec=updateEntityHealthBureau(jsonObjectPznrStr);
+ if (jsonResultEntityRec.isFlag()){
+ JSONObject json = (JSONObject) JSONObject.toJSON(jsonResultEntityRec.getAttribute());
+ logger.info("账套号:{}的GROU8得凭证同步更新卫生局的返回结果为:{}", jsonObjectPzml.getString("zth"),json.toJSONString());
+ }
+ /* if(jsonResultEntityReceiverUpdate.getStatus().equals("200")&&jsonResultEntityReceiverUpdate.getAttribute()!=null){
+ //更新日志
+ updateEntity(jsonObjectPznrStr);
+ }*/
+ }
+ }
+ }
+ }
+ return "同步GROU8凭证成功";
+ }
+ }
+
+
+ //查询凭证
+ @Override
+ public JsonResultEntity queryEntityPage(JSONObject json) {
+ JSONObject jsonObject = json.getJSONObject("jsonStr");
+ SenderGlPzmlEntity senderGlPzmlEntity = jsonObject.toJavaObject(SenderGlPzmlEntity.class);
+ //如果没有传入年度,则查询当年得,避免数据查询太大
+ if (senderGlPzmlEntity.getKjqj() == null) {
+ senderGlPzmlEntity.setKjqj(DateUtil.format(new Date(),"yyyy"));
+ }
+ if(StrUtil.isEmpty(senderGlPzmlEntity.getZth())){
+ logger.info("======传递的账套号为:{}=========",senderGlPzmlEntity.getZth());
+ return BaseResult.getFailureMessageEntity("请传递账套号");
+ }
+ List list=new ArrayList<>();
+ List senderGlPzmlEntities=new ArrayList<>();
+ try {
+ /*switch (senderGlPzmlEntity.getZth()){
+ case "003"://练市人民医院
+ senderGlPzmlEntities=senderGlPzmlDao.querySenderGlPzmlEntity(senderGlPzmlEntity);
+ break;
+ case "004"://双林镇中心卫生院
+ senderGlPzmlEntities=senderGlPzmlDao.querySenderGlPzmlEntity(senderGlPzmlEntity);
+ break;
+ case "005"://练市镇中心卫生院
+ senderGlPzmlEntities=senderGlPzmlDao.querySenderGlPzmlEntity(senderGlPzmlEntity);
+ break;
+ case "007"://善琏镇卫生院
+ senderGlPzmlEntities=senderGlPzmlDao.querySenderGlPzmlEntity(senderGlPzmlEntity);
+ break;
+ case "009":
+ senderGlPzmlEntities=senderGlPzmlDao.querySenderGlPzmlEntity(senderGlPzmlEntity);
+ break;
+ case "010":
+ senderGlPzmlEntities=senderGlPzmlDao.querySenderGlPzmlEntity(senderGlPzmlEntity);
+ break;
+ case "011":
+ senderGlPzmlEntities=senderGlPzmlDao.querySenderGlPzmlEntity(senderGlPzmlEntity);
+ break;
+ case "012":
+ senderGlPzmlEntities=senderGlPzmlDao.querySenderGlPzmlEntity(senderGlPzmlEntity);
+ break;
+ case "001"://南浔区人民医院
+ senderGlPzmlEntities=senderGlPzmlDao.querySenderGlPzmlEntity(senderGlPzmlEntity);
+ break;
+ default:
+ break;
+ }*/
+ senderGlPzmlEntities=senderGlPzmlDao.querySenderGlPzmlEntity(senderGlPzmlEntity);
+ if (CollectionUtils.isEmpty(senderGlPzmlEntities)) {
+ logger.info("{}账套GRPU8没有凭证目录信息",senderGlPzmlEntity.getZth());
+ return BaseResult.getSuccessMessageEntity("GRPU8没有凭证目录信息",null);
+ } else {
+ for (SenderGlPzmlEntity pzmlEntity : senderGlPzmlEntities) {
+ JSONObject jsonObjectPz=new JSONObject();
+ jsonObjectPz.put("gl_pzml",pzmlEntity);
+ //根据凭证号,会计期间,账套号查询凭证内容信息
+ SenderGlPznrEntity senderGlPznrEntity = new SenderGlPznrEntity();
+ senderGlPznrEntity.setKjqj(pzmlEntity.getKjqj());
+ senderGlPznrEntity.setZth(pzmlEntity.getZth());
+ senderGlPznrEntity.setPzh(pzmlEntity.getPzh());
+ senderGlPznrEntity.setGsdm(pzmlEntity.getGsdm());
+ senderGlPznrEntity.setIdpzh(pzmlEntity.getIdpzh());
+ senderGlPznrEntity.setDataSourceCode(senderGlPzmlEntity.getDataSourceCode());
+ List senderGlPznrEntities=new ArrayList<>();
+ /*switch (senderGlPzmlEntity.getZth()){
+ case "003"://练市人民医院
+ senderGlPznrEntities= senderGlPznrDao.querySenderGlPznrEntity(senderGlPznrEntity);
+ break;
+ case "004"://双林镇中心卫生院
+ senderGlPznrEntities= senderGlPznrDao.querySenderGlPznrEntity(senderGlPznrEntity);
+ break;
+ case "005"://练市镇中心卫生院
+ senderGlPznrEntities= senderGlPznrDao.querySenderGlPznrEntity(senderGlPznrEntity);
+ break;
+ case "007"://善琏镇卫生院
+ senderGlPznrEntities= senderGlPznrDao.querySenderGlPznrEntity(senderGlPznrEntity);
+ break;
+ case "009":
+ senderGlPznrEntities= senderGlPznrDao.querySenderGlPznrEntity(senderGlPznrEntity);
+ break;
+ case "010":
+ senderGlPznrEntities= senderGlPznrDao.querySenderGlPznrEntity(senderGlPznrEntity);
+ break;
+ case "011":
+ senderGlPznrEntities= senderGlPznrDao.querySenderGlPznrEntity(senderGlPznrEntity);
+ break;
+ case "012":
+ senderGlPznrEntities= senderGlPznrDao.querySenderGlPznrEntity(senderGlPznrEntity);
+ break;
+ case "001"://南浔区人民医院
+ senderGlPznrEntities= senderGlPznrDao.querySenderGlPznrEntity(senderGlPznrEntity);
+ break;
+ default:
+ break;
+ }*/
+ senderGlPznrEntities= senderGlPznrDao.querySenderGlPznrEntity(senderGlPznrEntity);
+ jsonObjectPz.put("gl_pznr",senderGlPznrEntities);
+ list.add(jsonObjectPz);
+ }
+ return BaseResult.getSuccessMessageEntity("查询凭证成功",list);
+ }
+ } catch (Exception e) {
+ logger.info("{}账套查询GROU8凭证信息失败:{}", senderGlPzmlEntity.getZth(),e.getMessage());
+ return BaseResult.getFailureMessageEntity("查询GROU8凭证信息失败");
+ }
+ }
+
+ //保存凭证到凭证日志表中 发送方
+ @Override
+ public JsonResultEntity saveEntity(JSONObject json) {
+ JSONObject jsonObject = json.getJSONObject("jsonStr");
+ JSONObject jsonObjectMain = jsonObject.getJSONObject("main");//或者凭证目录
+ JSONArray jsonArray = jsonObject.getJSONArray("details");
+ if (StrUtil.isEmpty(jsonObject.getString("kjqj"))) {
+ throw new RuntimeException("会计期间为空");
+ }
+ if (StrUtil.isEmpty(jsonObject.getString("gsdm"))) {
+ throw new RuntimeException("公司代码为空");
+ }
+ if (StrUtil.isEmpty(jsonObject.getString("zth"))) {
+ throw new RuntimeException("账套编号为空");
+ }
+ if (StrUtil.isEmpty(jsonObject.getString("pzh"))) {
+ throw new RuntimeException("凭证号为空");
+ }
+ //生成idpzh
+ String idpzh = jsonObjectMain.getString("idpzh")==null?String.valueOf(UUID.randomUUID()):jsonObjectMain.getString("idpzh");
+ jsonObjectMain.put("kjqj",jsonObject.getString("kjqj"));
+ jsonObjectMain.put("idpzh",idpzh);
+ jsonObjectMain.put("gsdm",jsonObject.getString("gsdm"));
+ jsonObjectMain.put("zth",jsonObject.getString("zth"));
+ jsonObjectMain.put("pzh",jsonObject.getString("pzh"));
+ SenderGlPzmlEntity senderGlPzmlEntity = jsonObjectMain.toJavaObject(SenderGlPzmlEntity.class);
+ try {
+ logger.info("===========开始保存凭证日志,idpzh:{},pzh:{}=========",senderGlPzmlEntity.getIdpzh(),senderGlPzmlEntity.getPzh());
+ SenderGlPzmlEntity glPzmlEntity = senderGlPzmlDao.saveSenderGlPzmlEntity(senderGlPzmlEntity);
+ List list=new ArrayList();
+ JSONObject jsonObjectSend=new JSONObject();
+ jsonObjectSend.put("pzml",glPzmlEntity);
+ List listPznr=new ArrayList<>();
+ //遍历数组,得到凭证内容
+ if(jsonArray.size()>0&&jsonArray!=null){
+ for (Object o : jsonArray) {
+ SenderGlPznrEntity glPznrEntity=(SenderGlPznrEntity)o;
+ glPznrEntity.setKjqj(jsonObject.getString("kjqj"));
+ glPznrEntity.setGsdm(jsonObject.getString("gsdm"));
+ glPznrEntity.setZth(jsonObject.getString("zth"));
+ glPznrEntity.setPzh(jsonObject.getString("pzh"));
+ glPznrEntity.setIdpznr(glPznrEntity.getIdpznr() == null ? String.valueOf(UUID.randomUUID()) : glPznrEntity.getIdpznr() );
+ SenderGlPznrEntity senderGlPznrEntity = senderGlPznrDao.saveSenderGlPznrEntity(glPznrEntity);
+ listPznr.add(senderGlPznrEntity);
+ }
+ }
+ jsonObjectSend.put("pznr",listPznr);
+ list.add(jsonObjectSend);
+ return BaseResult.getSuccessMessageEntity("保存凭证日志成功",list);
+ }catch (Exception e){
+ logger.info("保存GRPU8凭证日志失败:{}", e.getMessage());
+ return BaseResult.getFailureMessageEntity("凭证日志保存失败");
+ }
+ }
+
+ //更新凭证到凭证日志表中 发送方
+ @Override
+ public JsonResultEntity updateEntity(JSONObject json) {
+ JSONObject jsonObject = json.getJSONObject("jsonStr");
+ JSONObject jsonObjectMain = jsonObject.getJSONObject("main");//或者凭证目录
+ JSONArray jsonArray = jsonObject.getJSONArray("details");
+ if (StrUtil.isEmpty(jsonObject.getString("kjqj"))) {
+ throw new RuntimeException("会计期间为空");
+ }
+ if (StrUtil.isEmpty(jsonObject.getString("gsdm"))) {
+ throw new RuntimeException("公司代码为空");
+ }
+ if (StrUtil.isEmpty(jsonObject.getString("zth"))) {
+ throw new RuntimeException("账套编号为空");
+ }
+ if (StrUtil.isEmpty(jsonObject.getString("pzh"))) {
+ throw new RuntimeException("凭证号为空");
+ }
+ if (StrUtil.isEmpty(jsonObjectMain.getString("idpzh"))) {
+ throw new RuntimeException("idpzh为空");
+ }
+ SenderGlPzmlEntity senderGlPzmlEntity = jsonObjectMain.toJavaObject(SenderGlPzmlEntity.class);
+ senderGlPzmlEntity.setKjqj(jsonObject.getString("kjqj"));
+ senderGlPzmlEntity.setGsdm(jsonObject.getString("gsdm"));
+ senderGlPzmlEntity.setZth(jsonObject.getString("zth"));
+ senderGlPzmlEntity.setPzh(jsonObject.getString("pzh"));
+ try {
+ logger.info("==========开始更新凭证日志,idpzh:{},pzh:{}",senderGlPzmlEntity.getIdpzh(),senderGlPzmlEntity.getPzh());
+ SenderGlPzmlEntity senderGlPzmlEntitySend = senderGlPzmlDao.updateSenderGlPzmlEntity(senderGlPzmlEntity);
+ List list=new ArrayList<>();
+ JSONObject jsonObjectPz=new JSONObject();
+ jsonObjectPz.put("pzml",senderGlPzmlEntitySend);
+ List listPznr=new ArrayList<>();
+ //遍历数组,得到凭证内容
+ if(jsonArray.size()>0&&jsonArray!=null){
+ for (Object o : jsonArray) {
+ SenderGlPznrEntity glPznrEntity=(SenderGlPznrEntity)o;
+ SenderGlPznrEntity senderGlPznr=new SenderGlPznrEntity();
+ senderGlPznr.setKjqj(jsonObject.getString("kjqj"));
+ senderGlPznr.setGsdm(jsonObject.getString("gsdm"));
+ senderGlPznr.setZth(jsonObject.getString("zth"));
+ senderGlPznr.setPzh(jsonObject.getString("pzh"));
+ senderGlPznr.setIdpznr(glPznrEntity.getIdpznr());
+ //根据凭证内容id等条件查询在凭证内容日志中是否存在,如果存在,则更新,如果不存在则新增
+ //比如 凭证内容8条,日志中只有7条,则多余的一条新增,剩下7条更新
+ SenderGlPznrEntity pznrEntity = senderGlPznrDao.querySenderGlPznrEntityOne(senderGlPznr);
+ if(pznrEntity==null){
+ SenderGlPznrEntity senderGlPznrEntity = senderGlPznrDao.saveSenderGlPznrEntity(glPznrEntity);
+ listPznr.add(senderGlPznrEntity);
+ }else{
+ SenderGlPznrEntity senderGlPznrEntity = senderGlPznrDao.updateSenderGlPznrEntity(glPznrEntity);
+ listPznr.add(senderGlPznrEntity);
+ }
+ }
+ }
+ jsonObjectPz.put("pznr",listPznr);
+ list.add(jsonObjectPz);
+ return BaseResult.getSuccessMessageEntity("凭证日志更新成功",list);
+ }catch (Exception e){
+ logger.info("更新GRPU8凭证日志失败:{}", e.getMessage());
+ return BaseResult.getFailureMessageEntity("凭证日志更新失败");
+ }
+ }
+
+ //查询凭证
+ @Override
+ public JsonResultEntity queryEntityPageHealthBureau(JSONObject json) {
+ JSONObject jsonObject = json.getJSONObject("jsonStr");
+ SenderGlPzmlEntity receiverGlPzmlEntity = jsonObject.toJavaObject(SenderGlPzmlEntity.class);
+ if(receiverGlPzmlEntity.getIdpzh()!=null) {
+ try {
+ List list=new ArrayList<>();
+ logger.info("====开始根据账套号:{}和凭证号:{}查询卫生局里面得凭证数据",receiverGlPzmlEntity.getZth(),receiverGlPzmlEntity.getIdpzh());
+ List receiverGlPzmlEntities = senderGlPzmlDao.queryGlPzmlHealthBureau(receiverGlPzmlEntity);
+ if(CollectionUtils.isNotEmpty(receiverGlPzmlEntities)){
+ for (SenderGlPzmlEntity glPzmlEntity : receiverGlPzmlEntities) {
+ JSONObject jsonObjectStr=new JSONObject();
+ jsonObjectStr.put("main",glPzmlEntity);
+ //根据凭证号,会计期间,账套号查询凭证内容信息
+ SenderGlPznrEntity receiverGlPznrEntity = new SenderGlPznrEntity();
+ receiverGlPznrEntity.setKjqj(glPzmlEntity.getKjqj());
+ receiverGlPznrEntity.setZth(glPzmlEntity.getZth());
+ receiverGlPznrEntity.setPzh(glPzmlEntity.getPzh());
+ receiverGlPznrEntity.setGsdm(glPzmlEntity.getGsdm());
+ List receiverGlPznrEntities = senderGlPznrDao.queryGlPznrHealthBureau(receiverGlPznrEntity);
+ jsonObjectStr.put("details",receiverGlPznrEntities);
+ list.add(jsonObjectStr);
+ }
+ return BaseResult.getSuccessMessageEntity("查询凭证成功",list);
+ }else{
+ logger.info("根据idpzh:{}和账套号:{}查询接收方的凭证为空",receiverGlPzmlEntity.getZth(),receiverGlPzmlEntity.getIdpzh());
+ return BaseResult.getSuccessMessageEntity("查询接收方的凭证为空");
+ }
+ } catch (Exception e) {
+ logger.info("根据账套号:{}查询卫生局得GROU8凭证信息失败:{}", receiverGlPzmlEntity.getZth(),e.getMessage());
+ return BaseResult.getFailureMessageEntity("查询接收方得GROU8凭证信息失败");
+ }
+ }
+ return null;
+ }
+
+ //保存凭证
+ @Override
+ public JsonResultEntity saveEntityHealthBureau(JSONObject json) {
+ JSONObject jsonObject = json.getJSONObject("jsonStr");
+ JSONObject jsonObjectMain = jsonObject.getJSONObject("main");//获取凭证目录
+ JSONArray jsonArray = jsonObject.getJSONArray("details");//获取凭证内容
+ if (!checkStr(jsonObject.getString("kjqj"))) {
+ return BaseResult.getFailureMessageEntity("会计期间为空");
+ }
+ if (!checkStr(jsonObject.getString("gsdm"))) {
+ return BaseResult.getFailureMessageEntity("公司代码为空");
+ }
+ if (!checkStr(jsonObject.getString("zth"))) {
+ return BaseResult.getFailureMessageEntity("账套编号为空");
+ }
+ if (!checkStr(jsonObject.getString("pzh"))) {
+ return BaseResult.getFailureMessageEntity("凭证号为空");
+ }
+ //生成idpzh
+ String idpzh = jsonObjectMain.getString("idpzh")==null?String.valueOf(UUID.randomUUID()):jsonObjectMain.getString("idpzh");
+ jsonObjectMain.put("kjqj",jsonObject.getString("kjqj"));
+ jsonObjectMain.put("idpzh",idpzh);
+ jsonObjectMain.put("gsdm",jsonObject.getString("gsdm"));
+ jsonObjectMain.put("zth",jsonObject.getString("zth"));
+ jsonObjectMain.put("pzh",jsonObject.getString("pzh"));
+ SenderGlPzmlEntity glPzmlEntity = jsonObjectMain.toJavaObject(SenderGlPzmlEntity.class);
+ try {
+ logger.info("===========根据账套号:{}开始保存凭证,idpzh:{},pzh:{}=========",glPzmlEntity.getZth(),glPzmlEntity.getIdpzh(),glPzmlEntity.getPzh());
+ SenderGlPzmlEntity receiverGlPzmlEntity = senderGlPzmlDao.saveGlPzmlHealthBureau(glPzmlEntity);
+ List list=new ArrayList<>();
+ JSONObject jsonObjectReceiver =new JSONObject();
+ jsonObjectReceiver.put("gl_pzml",receiverGlPzmlEntity);
+ List listGlPznr=new ArrayList<>();
+ //遍历数组,得到凭证内容
+ if(jsonArray.size()>0&&jsonArray!=null) {
+ for (Object o : jsonArray) {
+ SenderGlPznrEntity receiverGlPznrEntity=(SenderGlPznrEntity)o;
+ receiverGlPznrEntity.setKjqj(jsonObject.getString("kjqj"));
+ receiverGlPznrEntity.setGsdm(jsonObject.getString("gsdm"));
+ receiverGlPznrEntity.setZth(jsonObject.getString("zth"));
+ receiverGlPznrEntity.setPzh(jsonObject.getString("pzh"));
+ receiverGlPznrEntity.setDataSourceCode(glPzmlEntity.getDataSourceCode());
+ receiverGlPznrEntity.setIdpznr(receiverGlPznrEntity.getIdpznr()== null ? String.valueOf(UUID.randomUUID()) : receiverGlPznrEntity.getIdpznr());
+ SenderGlPznrEntity glPznrEntity = senderGlPznrDao.saveGlPznrHealthBureau(receiverGlPznrEntity);
+ listGlPznr.add(glPznrEntity);
+ }
+ }
+ jsonObjectReceiver.put("gl_pznr",listGlPznr);
+ list.add(jsonObjectReceiver);
+ return BaseResult.getSuccessMessageEntity("保存凭证成功",jsonObjectReceiver);
+ }catch (Exception e){
+ logger.info("根据账套号:{}保存GRPU8凭证失败:{}",jsonObjectMain.getString("zth"),e.getMessage());
+ return BaseResult.getFailureMessageEntity("凭证保存失败");
+ }
+ }
+
+ //更新凭证
+ @Override
+ public JsonResultEntity updateEntityHealthBureau(JSONObject json) {
+ JSONObject jsonObject = json.getJSONObject("jsonStr");
+ JSONObject jsonObjectMain = jsonObject.getJSONObject("main");//或者凭证目录
+ JSONArray jsonArray = jsonObject.getJSONArray("details");
+ if (!checkStr(jsonObject.getString("kjqj"))) {
+ return BaseResult.getFailureMessageEntity("会计期间为空");
+ }
+ if (!checkStr(jsonObject.getString("gsdm"))) {
+ return BaseResult.getFailureMessageEntity("公司代码为空");
+ }
+ if (!checkStr(jsonObject.getString("zth"))) {
+ return BaseResult.getFailureMessageEntity("账套编号为空");
+ }
+ if (!checkStr(jsonObject.getString("pzh"))) {
+ return BaseResult.getFailureMessageEntity("凭证号为空");
+ }
+ if (!checkStr(jsonObjectMain.getString("idpzh"))) {
+ return BaseResult.getFailureMessageEntity("idpzh为空");
+ }
+ if(jsonArray.size()>0&&jsonArray!=null){
+ for (Object o : jsonArray) {
+ SenderGlPznrEntity senderGlPznrEntity = (SenderGlPznrEntity)o;
+ if (StrUtil.isEmpty(senderGlPznrEntity.getIdpznr())) {
+ return BaseResult.getFailureMessageEntity("凭证内容得id为空");
+ }
+ }
+ }
+ SenderGlPzmlEntity receiverGlPzmlEntity = jsonObjectMain.toJavaObject(SenderGlPzmlEntity.class);
+ receiverGlPzmlEntity.setKjqj(jsonObject.getString("kjqj"));
+ receiverGlPzmlEntity.setGsdm(jsonObject.getString("gsdm"));
+ receiverGlPzmlEntity.setZth(jsonObject.getString("zth"));
+ receiverGlPzmlEntity.setPzh(jsonObject.getString("pzh"));
+ try {
+ logger.info("==========开始根据账套号:{}更新凭证,idpzh:{},pzh:{}",receiverGlPzmlEntity.getZth(),receiverGlPzmlEntity.getIdpzh(),receiverGlPzmlEntity.getPzh());
+ SenderGlPzmlEntity glPzmlEntity = senderGlPzmlDao.updateGlPzmlHealthBureau(receiverGlPzmlEntity);
+ List list=new ArrayList<>();
+ JSONObject jsonObjectPz=new JSONObject();
+ jsonObjectPz.put("gl_pzml",glPzmlEntity);
+ List listPznr=new ArrayList<>();
+ //遍历数组,得到凭证内容
+ if(jsonArray.size()>0 && jsonArray!=null){
+ for (Object o : jsonArray) {
+ SenderGlPznrEntity receiverGlPznr=(SenderGlPznrEntity)o;
+ receiverGlPznr.setKjqj(jsonObject.getString("kjqj"));
+ receiverGlPznr.setGsdm(jsonObject.getString("gsdm"));
+ receiverGlPznr.setZth(jsonObject.getString("zth"));
+ receiverGlPznr.setPzh(jsonObject.getString("pzh"));
+ receiverGlPznr.setDataSourceCode(receiverGlPzmlEntity.getDataSourceCode());
+ //根据凭证内容id等条件查询在接收方凭证内容中是否存在,如果存在,则更新,如果不存在则新增
+ //比如 发送方的凭证内容8条,接收方只有7条,则多余的一条新增,剩下7条更新
+ SenderGlPznrEntity senderGlPznrEntity = senderGlPznrDao.querySenderGlPznrEntityOne(receiverGlPznr);
+ if(senderGlPznrEntity==null){
+ SenderGlPznrEntity glPznrEntity = senderGlPznrDao.saveGlPznrHealthBureau(receiverGlPznr);
+ listPznr.add(glPznrEntity);
+ }else {
+ SenderGlPznrEntity glPznrEntity = senderGlPznrDao.updateGlPznrHealthBureau(receiverGlPznr);
+ listPznr.add(glPznrEntity);
+ }
+ }
+ }
+ jsonObjectPz.put("gl_pznr",listPznr);
+ list.add(jsonObjectPz);
+ return BaseResult.getSuccessMessageEntity("凭证更新成功",list);
+ }catch (Exception e){
+ logger.info("根据账套号:{}更新GRPU8凭证失败:{}", receiverGlPzmlEntity.getZth(),e.getMessage());
+ return BaseResult.getFailureMessageEntity("凭证更新失败");
+ }
+ }
+
+ //删除凭证
+ @Override
+ public JsonResultEntity deleteEntityHealthBureau(JSONObject json) {
+ JSONObject jsonObject = json.getJSONObject("jsonStr");
+ JSONObject jsonObjectMain = jsonObject.getJSONObject("main");//或者凭证目录
+ JSONArray jsonArray = jsonObject.getJSONArray("details");
+ if (!checkStr(jsonObject.getString("gsdm"))) {
+ return BaseResult.getFailureMessageEntity("公司代码为空");
+ }
+ if (!checkStr(jsonObject.getString("zth"))) {
+ return BaseResult.getFailureMessageEntity("账套编号为空");
+ }
+ if (!checkStr(jsonObject.getString("kjqj"))) {
+ jsonObject.put("kjqj",DateUtil.format(new Date(),"yyyyMM"));
+ }
+ SenderGlPzmlEntity receiverGlPzmlEntity = jsonObjectMain.toJavaObject(SenderGlPzmlEntity.class);
+ receiverGlPzmlEntity.setKjqj(jsonObject.getString("kjqj"));
+ receiverGlPzmlEntity.setGsdm(jsonObject.getString("gsdm"));
+ receiverGlPzmlEntity.setZth(jsonObject.getString("zth"));
+ receiverGlPzmlEntity.setPzh(jsonObject.getString("pzh"));
+ try {
+ logger.info("==========开始根据账套号:{}删除凭证,idpzh:{},pzh:{}",receiverGlPzmlEntity.getZth(),receiverGlPzmlEntity.getIdpzh(),receiverGlPzmlEntity.getPzh());
+ Integer integer = senderGlPzmlDao.deleteGlPzmlHealthBureau(receiverGlPzmlEntity);
+ //遍历数组,得到凭证内容
+ if(jsonArray.size()>0 && jsonArray!=null){
+ for (Object o : jsonArray) {
+ SenderGlPznrEntity receiverGlPznr=(SenderGlPznrEntity)o;
+ receiverGlPznr.setKjqj(jsonObject.getString("kjqj"));
+ receiverGlPznr.setGsdm(jsonObject.getString("gsdm"));
+ receiverGlPznr.setZth(jsonObject.getString("zth"));
+ receiverGlPznr.setPzh(jsonObject.getString("pzh"));
+ receiverGlPznr.setDataSourceCode(receiverGlPzmlEntity.getDataSourceCode());
+ Integer i = senderGlPznrDao.deleteGlPznrHealthBureau(receiverGlPznr);
+ }
+ }
+ return BaseResult.getSuccessMessageEntity("凭证删除成功",integer);
+ }catch (Exception e){
+ logger.info("根据账套号:{}删除GRPU8凭证失败:{}", receiverGlPzmlEntity.getZth(),e.getMessage());
+ return BaseResult.getFailureMessageEntity("凭证删除失败");
+ }
+ }
+
+
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/ISenderGlPznrDao.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/ISenderGlPznrDao.java
new file mode 100644
index 00000000..8c4709f0
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/ISenderGlPznrDao.java
@@ -0,0 +1,98 @@
+package com.hzya.frame.grpU8.nxproof.glPznr.dao;
+
+
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.grpU8.nxproof.glPznr.entity.SenderGlPznrEntity;
+
+import java.util.List;
+
+/**
+ * (gl_pznr: table)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-20 14:14:30
+ */
+public interface ISenderGlPznrDao extends IBaseDao {
+
+ /**
+ *
+ * @content 查询凭证内容 卫生院
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/20 10:11
+ * **/
+ List querySenderGlPznrEntity(SenderGlPznrEntity senderGlPznrEntity);
+
+ /**
+ *
+ * @content 保存凭证内容到凭证内容日志中 卫生院
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/29 15:08
+ * **/
+ SenderGlPznrEntity saveSenderGlPznrEntity(SenderGlPznrEntity senderGlPznrEntity);
+
+ /**
+ *
+ * @content 更新凭证内容到凭证内容表中 卫生院
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/29 15:09
+ * **/
+ SenderGlPznrEntity updateSenderGlPznrEntity(SenderGlPznrEntity senderGlPznrEntity);
+
+ /**
+ *
+ * @content 根据凭证内容id等条件,查询在凭证日志中是否存在,如果不存在,则新增
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/7/1 9:20
+ * **/
+ SenderGlPznrEntity querySenderGlPznrEntityOne(SenderGlPznrEntity senderGlPznrEntity);
+
+ /**
+ *
+ * @content 查询凭证内容 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/20 10:11
+ * **/
+ List queryGlPznrHealthBureau(SenderGlPznrEntity senderGlPznrEntity);
+
+ /**
+ *
+ * @content 保存凭证内容 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/29 14:05
+ * **/
+ SenderGlPznrEntity saveGlPznrHealthBureau(SenderGlPznrEntity senderGlPznrEntity);
+
+ /**
+ *
+ * @content 更新凭证内容 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/29 14:06
+ * **/
+ SenderGlPznrEntity updateGlPznrHealthBureau(SenderGlPznrEntity senderGlPznrEntity);
+
+ /**
+ *
+ * @content 删除凭证内容 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/8/9 17:57
+ * **/
+ Integer deleteGlPznrHealthBureau(SenderGlPznrEntity senderGlPznrEntity);
+
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/impl/SenderGlPznrDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/impl/SenderGlPznrDaoImpl.java
new file mode 100644
index 00000000..b682b1fb
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/impl/SenderGlPznrDaoImpl.java
@@ -0,0 +1,74 @@
+package com.hzya.frame.grpU8.nxproof.glPznr.dao.impl;
+
+
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+import com.hzya.frame.grpU8.nxproof.glPznr.dao.ISenderGlPznrDao;
+import com.hzya.frame.grpU8.nxproof.glPznr.entity.SenderGlPznrEntity;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * (GlPznr)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-20 14:14:30
+ */
+@Repository(value = "SenderGlPznrDaoImpl")
+public class SenderGlPznrDaoImpl extends MybatisGenericDao implements ISenderGlPznrDao {
+
+
+ @Override
+ @DS("#senderGlPznrEntity.dataSourceCode")
+ public List querySenderGlPznrEntity(SenderGlPznrEntity senderGlPznrEntity) {
+ return super.queryByLike(senderGlPznrEntity);
+ }
+
+ @Override
+ @DS("#senderGlPznrEntity.dataSourceCode")
+ public SenderGlPznrEntity saveSenderGlPznrEntity(SenderGlPznrEntity senderGlPznrEntity) {
+ return super.save(senderGlPznrEntity);
+ }
+
+ @Override
+ @DS("#senderGlPznrEntity.dataSourceCode")
+ public SenderGlPznrEntity updateSenderGlPznrEntity(SenderGlPznrEntity senderGlPznrEntity) {
+ return super.update(senderGlPznrEntity);
+ }
+
+ @Override
+ @DS("#senderGlPznrEntity.dataSourceCode")
+ public SenderGlPznrEntity querySenderGlPznrEntityOne(SenderGlPznrEntity senderGlPznrEntity) {
+ SenderGlPznrEntity glPznrEntity = (SenderGlPznrEntity)super.selectOne( "querySenderGlPznrEntityOne", senderGlPznrEntity);
+ return glPznrEntity;
+ }
+
+ @Override
+ @DS("#senderGlPznrEntity.dataSourceCode")
+ public List queryGlPznrHealthBureau(SenderGlPznrEntity senderGlPznrEntity) {
+ return super.query(senderGlPznrEntity);
+ }
+
+ @Override
+ @DS("#senderGlPznrEntity.dataSourceCode")
+ public SenderGlPznrEntity saveGlPznrHealthBureau(SenderGlPznrEntity senderGlPznrEntity) {
+ return super.save(senderGlPznrEntity);
+ }
+
+ @Override
+ @DS("#senderGlPznrEntity.dataSourceCode")
+ public SenderGlPznrEntity updateGlPznrHealthBureau(SenderGlPznrEntity senderGlPznrEntity) {
+ return super.update(senderGlPznrEntity);
+ }
+
+ @Override
+ @DS("#senderGlPznrEntity.dataSourceCode")
+ public Integer deleteGlPznrHealthBureau(SenderGlPznrEntity senderGlPznrEntity) {
+ return super.delete("SenderGlPznrEntity_delete_pznr",senderGlPznrEntity);
+ }
+
+
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.java
new file mode 100644
index 00000000..238db05c
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.java
@@ -0,0 +1,818 @@
+package com.hzya.frame.grpU8.nxproof.glPznr.entity;
+
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/**
+ * (GlPznr)实体类
+ *
+ * @author makejava
+ * @since 2024-06-20 14:14:30
+ */
+public class SenderGlPznrEntity extends BaseEntity {
+
+ private String gsdm;
+ private String zth;
+ private String kjqj;
+ private String pzly;
+ private String pzh;
+ private Integer flh;
+ private String zy;
+ private String kmdm;
+ private String wbdm;
+ private String hl;
+ private String jdbz;
+ private String wbje;
+ private String je;
+ private String spz;
+ private String wldrq;
+ private String sl;
+ private String dj;
+ private String bmdm;
+
+ private String wldm;
+ private String xmdm;
+ private String fzsm1;
+ private String fzsm2;
+ private String fzsm3;
+ private String fzsm4;
+ private String fzsm5;
+ private String fzsm6;
+ private String fzsm7;
+ private String fzsm8;
+ private String fzsm9;
+ private String cess;
+ private String fplx;
+ private String fprq;
+ private Integer fphfw1;
+ private Integer fphfw2;
+ private String jsfs;
+ private String zydm;
+ private String fzdm4;
+ private String fzdm5;
+ private String fzdm6;
+ private String fzdm7;
+ private String fzdm8;
+ private String fzdm9;
+ private String fzdm10;
+ private String fzdm11;
+ private String fzdm12;
+ private String fzdm13;
+ private String fzdm14;
+ private String fzdm15;
+ private String fzdm16;
+ private String fzdm17;
+ private String fzdm18;
+ private String fzdm19;
+ private String fzdm20;
+ private String fzdm21;
+ private String fzdm22;
+ private String fzdm23;
+ private String fzdm24;
+ private String fzdm25;
+ private String fzdm26;
+ private String fzdm27;
+ private String fzdm28;
+ private String fzdm29;
+ private String fzdm30;
+ private String idpznr;
+ private String wlh;
+ private Integer zbid;
+ private Integer edid;
+ private Integer jfsqid;
+
+ private String kjtxdm;
+
+ private String pzlxdm;
+
+ private String idpzh;
+
+ private String skrlx;
+
+ private String skrmc;
+ private String skrzh;
+
+ private String skryhdm;
+ private String skryhhh;
+
+ private String skryhmc;
+private String yszccy;
+
+private String xsflh;
+
+private String bxdid;
+private String htid;
+private String zckpbh;
+private String sflx;
+private String djbh;
+private String hzflh;
+private String cyxfx;
+private String dqrq;
+private String glidpznr;
+
+ public String getBxdid() {
+ return bxdid;
+ }
+
+ public void setBxdid(String bxdid) {
+ this.bxdid = bxdid;
+ }
+
+ public String getHtid() {
+ return htid;
+ }
+
+ public void setHtid(String htid) {
+ this.htid = htid;
+ }
+
+ public String getZckpbh() {
+ return zckpbh;
+ }
+
+ public void setZckpbh(String zckpbh) {
+ this.zckpbh = zckpbh;
+ }
+
+ public String getSflx() {
+ return sflx;
+ }
+
+ public void setSflx(String sflx) {
+ this.sflx = sflx;
+ }
+
+ public String getDjbh() {
+ return djbh;
+ }
+
+ public void setDjbh(String djbh) {
+ this.djbh = djbh;
+ }
+
+ public String getHzflh() {
+ return hzflh;
+ }
+
+ public void setHzflh(String hzflh) {
+ this.hzflh = hzflh;
+ }
+
+ public String getCyxfx() {
+ return cyxfx;
+ }
+
+ public void setCyxfx(String cyxfx) {
+ this.cyxfx = cyxfx;
+ }
+
+ public String getDqrq() {
+ return dqrq;
+ }
+
+ public void setDqrq(String dqrq) {
+ this.dqrq = dqrq;
+ }
+
+ public String getGlidpznr() {
+ return glidpznr;
+ }
+
+ public void setGlidpznr(String glidpznr) {
+ this.glidpznr = glidpznr;
+ }
+
+ public String getFzdm11() {
+ return fzdm11;
+ }
+
+ public void setFzdm11(String fzdm11) {
+ this.fzdm11 = fzdm11;
+ }
+
+ public String getFzdm12() {
+ return fzdm12;
+ }
+
+ public void setFzdm12(String fzdm12) {
+ this.fzdm12 = fzdm12;
+ }
+
+ public String getFzdm13() {
+ return fzdm13;
+ }
+
+ public void setFzdm13(String fzdm13) {
+ this.fzdm13 = fzdm13;
+ }
+
+ public String getFzdm14() {
+ return fzdm14;
+ }
+
+ public void setFzdm14(String fzdm14) {
+ this.fzdm14 = fzdm14;
+ }
+
+ public String getFzdm15() {
+ return fzdm15;
+ }
+
+ public void setFzdm15(String fzdm15) {
+ this.fzdm15 = fzdm15;
+ }
+
+ public String getFzdm16() {
+ return fzdm16;
+ }
+
+ public void setFzdm16(String fzdm16) {
+ this.fzdm16 = fzdm16;
+ }
+
+ public String getFzdm17() {
+ return fzdm17;
+ }
+
+ public void setFzdm17(String fzdm17) {
+ this.fzdm17 = fzdm17;
+ }
+
+ public String getFzdm18() {
+ return fzdm18;
+ }
+
+ public void setFzdm18(String fzdm18) {
+ this.fzdm18 = fzdm18;
+ }
+
+ public String getFzdm19() {
+ return fzdm19;
+ }
+
+ public void setFzdm19(String fzdm19) {
+ this.fzdm19 = fzdm19;
+ }
+
+ public String getFzdm20() {
+ return fzdm20;
+ }
+
+ public void setFzdm20(String fzdm20) {
+ this.fzdm20 = fzdm20;
+ }
+
+ public String getFzdm21() {
+ return fzdm21;
+ }
+
+ public void setFzdm21(String fzdm21) {
+ this.fzdm21 = fzdm21;
+ }
+
+ public String getFzdm22() {
+ return fzdm22;
+ }
+
+ public void setFzdm22(String fzdm22) {
+ this.fzdm22 = fzdm22;
+ }
+
+ public String getFzdm23() {
+ return fzdm23;
+ }
+
+ public void setFzdm23(String fzdm23) {
+ this.fzdm23 = fzdm23;
+ }
+
+ public String getFzdm24() {
+ return fzdm24;
+ }
+
+ public void setFzdm24(String fzdm24) {
+ this.fzdm24 = fzdm24;
+ }
+
+ public String getFzdm25() {
+ return fzdm25;
+ }
+
+ public void setFzdm25(String fzdm25) {
+ this.fzdm25 = fzdm25;
+ }
+
+ public String getFzdm26() {
+ return fzdm26;
+ }
+
+ public void setFzdm26(String fzdm26) {
+ this.fzdm26 = fzdm26;
+ }
+
+ public String getFzdm27() {
+ return fzdm27;
+ }
+
+ public void setFzdm27(String fzdm27) {
+ this.fzdm27 = fzdm27;
+ }
+
+ public String getFzdm28() {
+ return fzdm28;
+ }
+
+ public void setFzdm28(String fzdm28) {
+ this.fzdm28 = fzdm28;
+ }
+
+ public String getFzdm29() {
+ return fzdm29;
+ }
+
+ public void setFzdm29(String fzdm29) {
+ this.fzdm29 = fzdm29;
+ }
+
+ public String getFzdm30() {
+ return fzdm30;
+ }
+
+ public void setFzdm30(String fzdm30) {
+ this.fzdm30 = fzdm30;
+ }
+
+ public String getKjtxdm() {
+ return kjtxdm;
+ }
+
+ public void setKjtxdm(String kjtxdm) {
+ this.kjtxdm = kjtxdm;
+ }
+
+ public String getPzlxdm() {
+ return pzlxdm;
+ }
+
+ public void setPzlxdm(String pzlxdm) {
+ this.pzlxdm = pzlxdm;
+ }
+
+ public String getIdpzh() {
+ return idpzh;
+ }
+
+ public void setIdpzh(String idpzh) {
+ this.idpzh = idpzh;
+ }
+
+ public String getSkrlx() {
+ return skrlx;
+ }
+
+ public void setSkrlx(String skrlx) {
+ this.skrlx = skrlx;
+ }
+
+ public String getSkrmc() {
+ return skrmc;
+ }
+
+ public void setSkrmc(String skrmc) {
+ this.skrmc = skrmc;
+ }
+
+ public String getSkrzh() {
+ return skrzh;
+ }
+
+ public void setSkrzh(String skrzh) {
+ this.skrzh = skrzh;
+ }
+
+ public String getSkryhdm() {
+ return skryhdm;
+ }
+
+ public void setSkryhdm(String skryhdm) {
+ this.skryhdm = skryhdm;
+ }
+
+ public String getSkryhhh() {
+ return skryhhh;
+ }
+
+ public void setSkryhhh(String skryhhh) {
+ this.skryhhh = skryhhh;
+ }
+
+ public String getSkryhmc() {
+ return skryhmc;
+ }
+
+ public void setSkryhmc(String skryhmc) {
+ this.skryhmc = skryhmc;
+ }
+
+ public String getYszccy() {
+ return yszccy;
+ }
+
+ public void setYszccy(String yszccy) {
+ this.yszccy = yszccy;
+ }
+
+ public String getXsflh() {
+ return xsflh;
+ }
+
+ public void setXsflh(String xsflh) {
+ this.xsflh = xsflh;
+ }
+
+ public String getGsdm() {
+ return gsdm;
+ }
+
+ public void setGsdm(String gsdm) {
+ this.gsdm = gsdm;
+ }
+
+ public String getZth() {
+ return zth;
+ }
+
+ public void setZth(String zth) {
+ this.zth = zth;
+ }
+
+ public String getKjqj() {
+ return kjqj;
+ }
+
+ public void setKjqj(String kjqj) {
+ this.kjqj = kjqj;
+ }
+
+ public String getPzly() {
+ return pzly;
+ }
+
+ public void setPzly(String pzly) {
+ this.pzly = pzly;
+ }
+
+ public String getPzh() {
+ return pzh;
+ }
+
+ public void setPzh(String pzh) {
+ this.pzh = pzh;
+ }
+
+ public Integer getFlh() {
+ return flh;
+ }
+
+ public void setFlh(Integer flh) {
+ this.flh = flh;
+ }
+
+ public String getZy() {
+ return zy;
+ }
+
+ public void setZy(String zy) {
+ this.zy = zy;
+ }
+
+ public String getKmdm() {
+ return kmdm;
+ }
+
+ public void setKmdm(String kmdm) {
+ this.kmdm = kmdm;
+ }
+
+ public String getWbdm() {
+ return wbdm;
+ }
+
+ public void setWbdm(String wbdm) {
+ this.wbdm = wbdm;
+ }
+
+ public String getHl() {
+ return hl;
+ }
+
+ public void setHl(String hl) {
+ this.hl = hl;
+ }
+
+ public String getJdbz() {
+ return jdbz;
+ }
+
+ public void setJdbz(String jdbz) {
+ this.jdbz = jdbz;
+ }
+
+ public String getWbje() {
+ return wbje;
+ }
+
+ public void setWbje(String wbje) {
+ this.wbje = wbje;
+ }
+
+ public String getJe() {
+ return je;
+ }
+
+ public void setJe(String je) {
+ this.je = je;
+ }
+
+ public String getSpz() {
+ return spz;
+ }
+
+ public void setSpz(String spz) {
+ this.spz = spz;
+ }
+
+ public String getWldrq() {
+ return wldrq;
+ }
+
+ public void setWldrq(String wldrq) {
+ this.wldrq = wldrq;
+ }
+
+ public String getSl() {
+ return sl;
+ }
+
+ public void setSl(String sl) {
+ this.sl = sl;
+ }
+
+ public String getDj() {
+ return dj;
+ }
+
+ public void setDj(String dj) {
+ this.dj = dj;
+ }
+
+ public String getBmdm() {
+ return bmdm;
+ }
+
+ public void setBmdm(String bmdm) {
+ this.bmdm = bmdm;
+ }
+
+ public String getWldm() {
+ return wldm;
+ }
+
+ public void setWldm(String wldm) {
+ this.wldm = wldm;
+ }
+
+ public String getXmdm() {
+ return xmdm;
+ }
+
+ public void setXmdm(String xmdm) {
+ this.xmdm = xmdm;
+ }
+
+ public String getFzsm1() {
+ return fzsm1;
+ }
+
+ public void setFzsm1(String fzsm1) {
+ this.fzsm1 = fzsm1;
+ }
+
+ public String getFzsm2() {
+ return fzsm2;
+ }
+
+ public void setFzsm2(String fzsm2) {
+ this.fzsm2 = fzsm2;
+ }
+
+ public String getFzsm3() {
+ return fzsm3;
+ }
+
+ public void setFzsm3(String fzsm3) {
+ this.fzsm3 = fzsm3;
+ }
+
+ public String getFzsm4() {
+ return fzsm4;
+ }
+
+ public void setFzsm4(String fzsm4) {
+ this.fzsm4 = fzsm4;
+ }
+
+ public String getFzsm5() {
+ return fzsm5;
+ }
+
+ public void setFzsm5(String fzsm5) {
+ this.fzsm5 = fzsm5;
+ }
+
+ public String getFzsm6() {
+ return fzsm6;
+ }
+
+ public void setFzsm6(String fzsm6) {
+ this.fzsm6 = fzsm6;
+ }
+
+ public String getFzsm7() {
+ return fzsm7;
+ }
+
+ public void setFzsm7(String fzsm7) {
+ this.fzsm7 = fzsm7;
+ }
+
+ public String getFzsm8() {
+ return fzsm8;
+ }
+
+ public void setFzsm8(String fzsm8) {
+ this.fzsm8 = fzsm8;
+ }
+
+ public String getFzsm9() {
+ return fzsm9;
+ }
+
+ public void setFzsm9(String fzsm9) {
+ this.fzsm9 = fzsm9;
+ }
+
+ public String getCess() {
+ return cess;
+ }
+
+ public void setCess(String cess) {
+ this.cess = cess;
+ }
+
+ public String getFplx() {
+ return fplx;
+ }
+
+ public void setFplx(String fplx) {
+ this.fplx = fplx;
+ }
+
+ public String getFprq() {
+ return fprq;
+ }
+
+ public void setFprq(String fprq) {
+ this.fprq = fprq;
+ }
+
+ public Integer getFphfw1() {
+ return fphfw1;
+ }
+
+ public void setFphfw1(Integer fphfw1) {
+ this.fphfw1 = fphfw1;
+ }
+
+ public Integer getFphfw2() {
+ return fphfw2;
+ }
+
+ public void setFphfw2(Integer fphfw2) {
+ this.fphfw2 = fphfw2;
+ }
+
+ public String getJsfs() {
+ return jsfs;
+ }
+
+ public void setJsfs(String jsfs) {
+ this.jsfs = jsfs;
+ }
+
+ public String getZydm() {
+ return zydm;
+ }
+
+ public void setZydm(String zydm) {
+ this.zydm = zydm;
+ }
+
+ public String getFzdm4() {
+ return fzdm4;
+ }
+
+ public void setFzdm4(String fzdm4) {
+ this.fzdm4 = fzdm4;
+ }
+
+ public String getFzdm5() {
+ return fzdm5;
+ }
+
+ public void setFzdm5(String fzdm5) {
+ this.fzdm5 = fzdm5;
+ }
+
+ public String getFzdm6() {
+ return fzdm6;
+ }
+
+ public void setFzdm6(String fzdm6) {
+ this.fzdm6 = fzdm6;
+ }
+
+ public String getFzdm7() {
+ return fzdm7;
+ }
+
+ public void setFzdm7(String fzdm7) {
+ this.fzdm7 = fzdm7;
+ }
+
+ public String getFzdm8() {
+ return fzdm8;
+ }
+
+ public void setFzdm8(String fzdm8) {
+ this.fzdm8 = fzdm8;
+ }
+
+ public String getFzdm9() {
+ return fzdm9;
+ }
+
+ public void setFzdm9(String fzdm9) {
+ this.fzdm9 = fzdm9;
+ }
+
+ public String getFzdm10() {
+ return fzdm10;
+ }
+
+ public void setFzdm10(String fzdm10) {
+ this.fzdm10 = fzdm10;
+ }
+
+ public String getIdpznr() {
+ return idpznr;
+ }
+
+ public void setIdpznr(String idpznr) {
+ this.idpznr = idpznr;
+ }
+
+ public String getWlh() {
+ return wlh;
+ }
+
+ public void setWlh(String wlh) {
+ this.wlh = wlh;
+ }
+
+ public Integer getZbid() {
+ return zbid;
+ }
+
+ public void setZbid(Integer zbid) {
+ this.zbid = zbid;
+ }
+
+ public Integer getEdid() {
+ return edid;
+ }
+
+ public void setEdid(Integer edid) {
+ this.edid = edid;
+ }
+
+ public Integer getJfsqid() {
+ return jfsqid;
+ }
+
+ public void setJfsqid(Integer jfsqid) {
+ this.jfsqid = jfsqid;
+ }
+
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml
new file mode 100644
index 00000000..3e2eef96
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml
@@ -0,0 +1,896 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ gsdm
+ , ZTH
+ , kjqj
+ , pzly
+ , pzh
+ ,pzlxdm
+ ,kjtxdm
+ , flh
+ , zy
+ , kmdm
+ , wbdm
+ , hl
+ , jdbz
+ , wbje
+ , je
+ , spz
+ , wldrq
+ , sl
+ , dj
+ , bmdm
+ , wldm
+ , xmdm
+ , fzsm1
+ , fzsm2
+ , fzsm3
+ , fzsm4
+ , fzsm5
+ , fzsm6
+ , fzsm7
+ , fzsm8
+ , fzsm9
+ , cess
+ , fplx
+ , fprq
+ , fphfw1
+ , fphfw2
+ , jsfs
+ , zydm
+ , fzdm4
+ , fzdm5
+ , fzdm6
+ , fzdm7
+ , fzdm8
+ , fzdm9
+ , fzdm10
+ , IDPZNR
+ , wlh
+ , ZBID
+ , EDID
+ , JFSQID
+ , fzdm10
+ , fzdm11
+ , fzdm12
+ , fzdm13
+ , fzdm14
+ , fzdm15
+ , fzdm16
+ , fzdm17
+ , fzdm18
+ , fzdm19
+ , fzdm20
+ , fzdm21
+ , fzdm22
+ , fzdm23
+ , fzdm24
+ , fzdm25
+ , fzdm26
+ , fzdm27
+ , fzdm28
+ , fzdm29
+ , fzdm30
+ , idpzh
+ , skrlx
+ , skrmc
+ , skrzh
+ , skryhdm
+ , skryhhh
+ , skryhmc
+ , yszccy
+ , xsflh
+ , bxdid
+ , htid
+ , zckpbh
+ , sflx
+ , djbh
+ , hzflh
+ , cyxfx
+ , dqrq
+ , glidpznr
+
+
+
+ select
+
+ from gl_pznr
+
+ and gsdm = #{gsdm}
+ and ZTH = #{zth}
+ and kjqj = #{kjqj}
+ and pzly = #{pzly}
+ and pzh = #{pzh}
+ and flh = #{flh}
+ and zy = #{zy}
+ and kmdm = #{kmdm}
+ and wbdm = #{wbdm}
+ and hl = #{hl}
+ and jdbz = #{jdbz}
+ and wbje = #{wbje}
+ and je = #{je}
+ and spz = #{spz}
+ and wldrq = #{wldrq}
+ and sl = #{sl}
+ and dj = #{dj}
+ and bmdm = #{bmdm}
+ and wldm = #{wldm}
+ and xmdm = #{xmdm}
+ and fzsm1 = #{fzsm1}
+ and fzsm2 = #{fzsm2}
+ and fzsm3 = #{fzsm3}
+ and fzsm4 = #{fzsm4}
+ and fzsm5 = #{fzsm5}
+ and fzsm6 = #{fzsm6}
+ and fzsm7 = #{fzsm7}
+ and fzsm8 = #{fzsm8}
+ and fzsm9 = #{fzsm9}
+ and cess = #{cess}
+ and fplx = #{fplx}
+ and fprq = #{fprq}
+ and fphfw1 = #{fphfw1}
+ and fphfw2 = #{fphfw2}
+ and jsfs = #{jsfs}
+ and zydm = #{zydm}
+ and fzdm4 = #{fzdm4}
+ and fzdm5 = #{fzdm5}
+ and fzdm6 = #{fzdm6}
+ and fzdm7 = #{fzdm7}
+ and fzdm8 = #{fzdm8}
+ and fzdm9 = #{fzdm9}
+ and fzdm10 = #{fzdm10}
+ and IDPZNR = #{idpznr}
+ and idpzh = #{idpzh}
+ and wlh = #{wlh}
+ and ZBID = #{zbid}
+ and EDID = #{edid}
+ and JFSQID = #{jfsqid}
+ and idpzh = #{idpzh}
+ -- and zth in('004','005','009','010','011','012','014')
+
+
+
+
+
+ select
+
+ from gl_pznr
+
+ and gsdm = #{gsdm}
+ and ZTH = #{zth}
+ and kjqj = #{kjqj}
+ and pzly = #{pzly}
+ and pzh = #{pzh}
+ and flh = #{flh}
+ and zy = #{zy}
+ and kmdm = #{kmdm}
+ and wbdm = #{wbdm}
+ and hl = #{hl}
+ and jdbz = #{jdbz}
+ and wbje = #{wbje}
+ and je = #{je}
+ and spz = #{spz}
+ and wldrq = #{wldrq}
+ and sl = #{sl}
+ and dj = #{dj}
+ and bmdm = #{bmdm}
+ and wldm = #{wldm}
+ and xmdm = #{xmdm}
+ and fzsm1 = #{fzsm1}
+ and fzsm2 = #{fzsm2}
+ and fzsm3 = #{fzsm3}
+ and fzsm4 = #{fzsm4}
+ and fzsm5 = #{fzsm5}
+ and fzsm6 = #{fzsm6}
+ and fzsm7 = #{fzsm7}
+ and fzsm8 = #{fzsm8}
+ and fzsm9 = #{fzsm9}
+ and cess = #{cess}
+ and fplx = #{fplx}
+ and fprq = #{fprq}
+ and fphfw1 = #{fphfw1}
+ and fphfw2 = #{fphfw2}
+ and jsfs = #{jsfs}
+ and zydm = #{zydm}
+ and fzdm4 = #{fzdm4}
+ and fzdm5 = #{fzdm5}
+ and fzdm6 = #{fzdm6}
+ and fzdm7 = #{fzdm7}
+ and fzdm8 = #{fzdm8}
+ and fzdm9 = #{fzdm9}
+ and fzdm10 = #{fzdm10}
+ and IDPZNR = #{idpznr}
+ and wlh = #{wlh}
+ and ZBID = #{zbid}
+ and EDID = #{edid}
+ and JFSQID = #{jfsqid}
+
+
+
+
+
+
+ select count(1) from gl_pznr
+
+ and gsdm = #{gsdm}
+ and ZTH = #{zth}
+ and kjqj = #{kjqj}
+ and pzly = #{pzly}
+ and pzh = #{pzh}
+ and flh = #{flh}
+ and zy = #{zy}
+ and kmdm = #{kmdm}
+ and wbdm = #{wbdm}
+ and hl = #{hl}
+ and jdbz = #{jdbz}
+ and wbje = #{wbje}
+ and je = #{je}
+ and spz = #{spz}
+ and wldrq = #{wldrq}
+ and sl = #{sl}
+ and dj = #{dj}
+ and bmdm = #{bmdm}
+ and wldm = #{wldm}
+ and xmdm = #{xmdm}
+ and fzsm1 = #{fzsm1}
+ and fzsm2 = #{fzsm2}
+ and fzsm3 = #{fzsm3}
+ and fzsm4 = #{fzsm4}
+ and fzsm5 = #{fzsm5}
+ and fzsm6 = #{fzsm6}
+ and fzsm7 = #{fzsm7}
+ and fzsm8 = #{fzsm8}
+ and fzsm9 = #{fzsm9}
+ and cess = #{cess}
+ and fplx = #{fplx}
+ and fprq = #{fprq}
+ and fphfw1 = #{fphfw1}
+ and fphfw2 = #{fphfw2}
+ and jsfs = #{jsfs}
+ and zydm = #{zydm}
+ and fzdm4 = #{fzdm4}
+ and fzdm5 = #{fzdm5}
+ and fzdm6 = #{fzdm6}
+ and fzdm7 = #{fzdm7}
+ and fzdm8 = #{fzdm8}
+ and fzdm9 = #{fzdm9}
+ and fzdm10 = #{fzdm10}
+ and IDPZNR = #{idpznr}
+ and wlh = #{wlh}
+ and ZBID = #{zbid}
+ and EDID = #{edid}
+ and JFSQID = #{jfsqid}
+
+
+
+
+
+ select
+
+ from gl_pznr
+
+ and gsdm like concat('%',#{gsdm},'%')
+ and ZTH like concat('%',#{zth},'%')
+ and kjqj like concat('%',#{kjqj},'%')
+ and pzly like concat('%',#{pzly},'%')
+ and pzh like concat('%',#{pzh},'%')
+ and flh like concat('%',#{flh},'%')
+ and zy like concat('%',#{zy},'%')
+ and kmdm like concat('%',#{kmdm},'%')
+ and wbdm like concat('%',#{wbdm},'%')
+ and hl like concat('%',#{hl},'%')
+ and jdbz like concat('%',#{jdbz},'%')
+ and wbje like concat('%',#{wbje},'%')
+ and je like concat('%',#{je},'%')
+ and spz like concat('%',#{spz},'%')
+ and wldrq like concat('%',#{wldrq},'%')
+ and sl like concat('%',#{sl},'%')
+ and dj like concat('%',#{dj},'%')
+ and bmdm like concat('%',#{bmdm},'%')
+ and wldm like concat('%',#{wldm},'%')
+ and xmdm like concat('%',#{xmdm},'%')
+ and fzsm1 like concat('%',#{fzsm1},'%')
+ and fzsm2 like concat('%',#{fzsm2},'%')
+ and fzsm3 like concat('%',#{fzsm3},'%')
+ and fzsm4 like concat('%',#{fzsm4},'%')
+ and fzsm5 like concat('%',#{fzsm5},'%')
+ and fzsm6 like concat('%',#{fzsm6},'%')
+ and fzsm7 like concat('%',#{fzsm7},'%')
+ and fzsm8 like concat('%',#{fzsm8},'%')
+ and fzsm9 like concat('%',#{fzsm9},'%')
+ and cess like concat('%',#{cess},'%')
+ and fplx like concat('%',#{fplx},'%')
+ and fprq like concat('%',#{fprq},'%')
+ and fphfw1 like concat('%',#{fphfw1},'%')
+ and fphfw2 like concat('%',#{fphfw2},'%')
+ and jsfs like concat('%',#{jsfs},'%')
+ and zydm like concat('%',#{zydm},'%')
+ and fzdm4 like concat('%',#{fzdm4},'%')
+ and fzdm5 like concat('%',#{fzdm5},'%')
+ and fzdm6 like concat('%',#{fzdm6},'%')
+ and fzdm7 like concat('%',#{fzdm7},'%')
+ and fzdm8 like concat('%',#{fzdm8},'%')
+ and fzdm9 like concat('%',#{fzdm9},'%')
+ and fzdm10 like concat('%',#{fzdm10},'%')
+ and IDPZNR like concat('%',#{idpznr},'%')
+ and idpzh like concat('%',#{idpzh},'%')
+ and wlh like concat('%',#{wlh},'%')
+ and ZBID like concat('%',#{zbid},'%')
+ and EDID like concat('%',#{edid},'%')
+ and JFSQID like concat('%',#{jfsqid},'%')
+
+
+
+
+
+ select
+
+ from gl_pznr
+
+ or gsdm = #{gsdm}
+ or ZTH = #{zth}
+ or kjqj = #{kjqj}
+ or pzly = #{pzly}
+ or pzh = #{pzh}
+ or flh = #{flh}
+ or zy = #{zy}
+ or kmdm = #{kmdm}
+ or wbdm = #{wbdm}
+ or hl = #{hl}
+ or jdbz = #{jdbz}
+ or wbje = #{wbje}
+ or je = #{je}
+ or spz = #{spz}
+ or wldrq = #{wldrq}
+ or sl = #{sl}
+ or dj = #{dj}
+ or bmdm = #{bmdm}
+ or wldm = #{wldm}
+ or xmdm = #{xmdm}
+ or fzsm1 = #{fzsm1}
+ or fzsm2 = #{fzsm2}
+ or fzsm3 = #{fzsm3}
+ or fzsm4 = #{fzsm4}
+ or fzsm5 = #{fzsm5}
+ or fzsm6 = #{fzsm6}
+ or fzsm7 = #{fzsm7}
+ or fzsm8 = #{fzsm8}
+ or fzsm9 = #{fzsm9}
+ or cess = #{cess}
+ or fplx = #{fplx}
+ or fprq = #{fprq}
+ or fphfw1 = #{fphfw1}
+ or fphfw2 = #{fphfw2}
+ or jsfs = #{jsfs}
+ or zydm = #{zydm}
+ or fzdm4 = #{fzdm4}
+ or fzdm5 = #{fzdm5}
+ or fzdm6 = #{fzdm6}
+ or fzdm7 = #{fzdm7}
+ or fzdm8 = #{fzdm8}
+ or fzdm9 = #{fzdm9}
+ or fzdm10 = #{fzdm10}
+ or IDPZNR = #{idpznr}
+ or wlh = #{wlh}
+ or ZBID = #{zbid}
+ or EDID = #{edid}
+ or JFSQID = #{jfsqid}
+
+
+
+
+
+ insert into gl_pznr(
+
+ gsdm ,
+ kjqj ,
+ pzly ,
+ pzh ,
+ kjtxdm ,
+ pzlxdm ,
+ flh ,
+ zy ,
+ kmdm ,
+ wbdm ,
+ hl ,
+ jdbz ,
+ wbje ,
+ je ,
+ spz ,
+ wldrq ,
+ sl ,
+ dj ,
+ bmdm ,
+ wldm ,
+ xmdm ,
+ fzsm1 ,
+ fzsm2 ,
+ fzsm3 ,
+ fzsm4 ,
+ fzsm5 ,
+ fzsm6 ,
+ fzsm7 ,
+ fzsm8 ,
+ fzsm9 ,
+ cess ,
+ fplx ,
+ fprq ,
+ fphfw1 ,
+ fphfw2 ,
+ jsfs ,
+ zydm ,
+ fzdm4 ,
+ fzdm5 ,
+ fzdm6 ,
+ fzdm7 ,
+ fzdm8 ,
+ fzdm9 ,
+ fzdm10 ,
+ IDPZNR ,
+ wlh ,
+ ZBID ,
+ EDID ,
+ JFSQID ,
+ fzdm11 ,
+ fzdm12 ,
+ fzdm13 ,
+ fzdm14 ,
+ fzdm15 ,
+ fzdm16 ,
+ fzdm17 ,
+ fzdm18 ,
+ fzdm19 ,
+ fzdm20 ,
+ fzdm21 ,
+ fzdm22 ,
+ fzdm23 ,
+ fzdm24 ,
+ fzdm25 ,
+ fzdm26 ,
+ fzdm27 ,
+ fzdm28 ,
+ fzdm29 ,
+ fzdm30 ,
+ idpzh ,
+ skrlx ,
+ skrmc ,
+ skrzh ,
+ skryhdm ,
+ skryhhh ,
+ skryhmc ,
+ yszccy ,
+ xsflh ,
+ bxdid ,
+ htid ,
+ zckpbh ,
+ sflx ,
+ djbh ,
+ hzflh ,
+ cyxfx ,
+ dqrq ,
+ glidpznr ,
+ ZTH
+
+ )values(
+
+ #{gsdm} ,
+ #{kjqj} ,
+ #{pzly} ,
+ #{pzh} ,
+ #{kjtxdm} ,
+ #{pzlxdm} ,
+ #{flh} ,
+ #{zy} ,
+ #{kmdm} ,
+ #{wbdm} ,
+ #{hl} ,
+ #{jdbz} ,
+ #{wbje} ,
+ #{je} ,
+ #{spz} ,
+ #{wldrq} ,
+ #{sl} ,
+ #{dj} ,
+ #{bmdm} ,
+ #{wldm} ,
+ #{xmdm} ,
+ #{fzsm1} ,
+ #{fzsm2} ,
+ #{fzsm3} ,
+ #{fzsm4} ,
+ #{fzsm5} ,
+ #{fzsm6} ,
+ #{fzsm7} ,
+ #{fzsm8} ,
+ #{fzsm9} ,
+ #{cess} ,
+ #{fplx} ,
+ #{fprq} ,
+ #{fphfw1} ,
+ #{fphfw2} ,
+ #{jsfs} ,
+ #{zydm} ,
+ #{fzdm4} ,
+ #{fzdm5} ,
+ #{fzdm6} ,
+ #{fzdm7} ,
+ #{fzdm8} ,
+ #{fzdm9} ,
+ #{fzdm10} ,
+ #{idpznr} ,
+ #{wlh} ,
+ #{zbid} ,
+ #{edid} ,
+ #{jfsqid} ,
+ #{fzdm11} ,
+ #{fzdm12} ,
+ #{fzdm13} ,
+ #{fzdm14} ,
+ #{fzdm15} ,
+ #{fzdm16} ,
+ #{fzdm17} ,
+ #{fzdm18} ,
+ #{fzdm19} ,
+ #{fzdm20} ,
+ #{fzdm21} ,
+ #{fzdm22} ,
+ #{fzdm23} ,
+ #{fzdm24} ,
+ #{fzdm25} ,
+ #{fzdm26} ,
+ #{fzdm27} ,
+ #{fzdm28} ,
+ #{fzdm29} ,
+ #{fzdm30} ,
+ #{idpzh} ,
+ #{skrlx} ,
+ #{skrmc} ,
+ #{skrzh} ,
+ #{skryhdm} ,
+ #{skryhhh} ,
+ #{skryhmc} ,
+ #{yszccy} ,
+ #{xsflh} ,
+ #{bxdid},
+ #{htid} ,
+ #{zckpbh} ,
+ #{sflx} ,
+ #{djbh} ,
+ #{hzflh} ,
+ #{cyxfx} ,
+ #{dqrq} ,
+ #{glidpznr} ,
+ #{zth}
+
+ )
+
+
+
+ insert into gl_pznr(gsdm, ZTH, kjqj, pzly, pzh, flh, zy, kmdm, wbdm, hl, jdbz, wbje, je, spz, wldrq, sl, dj, bmdm, wldm, xmdm, fzsm1, fzsm2, fzsm3, fzsm4, fzsm5, fzsm6, fzsm7, fzsm8, fzsm9, cess, fplx, fprq, fphfw1, fphfw2, jsfs, zydm, fzdm4, fzdm5, fzdm6, fzdm7, fzdm8, fzdm9, fzdm10, IDPZNR, wlh, ZBID, EDID, JFSQID)
+ values
+
+ (#{entity.gsdm},#{entity.zth},#{entity.kjqj},#{entity.pzly},#{entity.pzh},#{entity.flh},#{entity.zy},#{entity.kmdm},#{entity.wbdm},#{entity.hl},#{entity.jdbz},#{entity.wbje},#{entity.je},#{entity.spz},#{entity.wldrq},#{entity.sl},#{entity.dj},#{entity.bmdm},#{entity.wldm},#{entity.xmdm},#{entity.fzsm1},#{entity.fzsm2},#{entity.fzsm3},#{entity.fzsm4},#{entity.fzsm5},#{entity.fzsm6},#{entity.fzsm7},#{entity.fzsm8},#{entity.fzsm9},#{entity.cess},#{entity.fplx},#{entity.fprq},#{entity.fphfw1},#{entity.fphfw2},#{entity.jsfs},#{entity.zydm},#{entity.fzdm4},#{entity.fzdm5},#{entity.fzdm6},#{entity.fzdm7},#{entity.fzdm8},#{entity.fzdm9},#{entity.fzdm10},#{entity.idpznr},#{entity.wlh},#{entity.zbid},#{entity.edid},#{entity.jfsqid})
+
+
+
+
+ insert into gl_pznr(gsdm, ZTH, kjqj, pzly, pzh, flh, zy, kmdm, wbdm, hl, jdbz, wbje, je, spz, wldrq, sl, dj, bmdm, wldm, xmdm, fzsm1, fzsm2, fzsm3, fzsm4, fzsm5, fzsm6, fzsm7, fzsm8, fzsm9, cess, fplx, fprq, fphfw1, fphfw2, jsfs, zydm, fzdm4, fzdm5, fzdm6, fzdm7, fzdm8, fzdm9, fzdm10, IDPZNR, wlh, ZBID, EDID, JFSQID)
+ values
+
+ (#{entity.gsdm},#{entity.zth},#{entity.kjqj},#{entity.pzly},#{entity.pzh},#{entity.flh},#{entity.zy},#{entity.kmdm},#{entity.wbdm},#{entity.hl},#{entity.jdbz},#{entity.wbje},#{entity.je},#{entity.spz},#{entity.wldrq},#{entity.sl},#{entity.dj},#{entity.bmdm},#{entity.wldm},#{entity.xmdm},#{entity.fzsm1},#{entity.fzsm2},#{entity.fzsm3},#{entity.fzsm4},#{entity.fzsm5},#{entity.fzsm6},#{entity.fzsm7},#{entity.fzsm8},#{entity.fzsm9},#{entity.cess},#{entity.fplx},#{entity.fprq},#{entity.fphfw1},#{entity.fphfw2},#{entity.jsfs},#{entity.zydm},#{entity.fzdm4},#{entity.fzdm5},#{entity.fzdm6},#{entity.fzdm7},#{entity.fzdm8},#{entity.fzdm9},#{entity.fzdm10},#{entity.idpznr},#{entity.wlh},#{entity.zbid},#{entity.edid},#{entity.jfsqid})
+
+ on duplicate key update
+ gsdm = values(gsdm),
+ ZTH = values(ZTH),
+ kjqj = values(kjqj),
+ pzly = values(pzly),
+ pzh = values(pzh),
+ flh = values(flh),
+ zy = values(zy),
+ kmdm = values(kmdm),
+ wbdm = values(wbdm),
+ hl = values(hl),
+ jdbz = values(jdbz),
+ wbje = values(wbje),
+ je = values(je),
+ spz = values(spz),
+ wldrq = values(wldrq),
+ sl = values(sl),
+ dj = values(dj),
+ bmdm = values(bmdm),
+ wldm = values(wldm),
+ xmdm = values(xmdm),
+ fzsm1 = values(fzsm1),
+ fzsm2 = values(fzsm2),
+ fzsm3 = values(fzsm3),
+ fzsm4 = values(fzsm4),
+ fzsm5 = values(fzsm5),
+ fzsm6 = values(fzsm6),
+ fzsm7 = values(fzsm7),
+ fzsm8 = values(fzsm8),
+ fzsm9 = values(fzsm9),
+ cess = values(cess),
+ fplx = values(fplx),
+ fprq = values(fprq),
+ fphfw1 = values(fphfw1),
+ fphfw2 = values(fphfw2),
+ jsfs = values(jsfs),
+ zydm = values(zydm),
+ fzdm4 = values(fzdm4),
+ fzdm5 = values(fzdm5),
+ fzdm6 = values(fzdm6),
+ fzdm7 = values(fzdm7),
+ fzdm8 = values(fzdm8),
+ fzdm9 = values(fzdm9),
+ fzdm10 = values(fzdm10),
+ IDPZNR = values(IDPZNR),
+ wlh = values(wlh),
+ ZBID = values(ZBID),
+ EDID = values(EDID),
+ JFSQID = values(JFSQID)
+
+
+ update gl_pznr set
+
+ gsdm = #{gsdm},
+ ZTH = #{zth},
+ kjqj = #{kjqj},
+ pzly = #{pzly},
+ pzh = #{pzh},
+ kjtxdm = #{kjtxdm},
+ pzlxdm = #{pzlxdm},
+ flh = #{flh},
+ zy = #{zy},
+ kmdm = #{kmdm},
+ wbdm = #{wbdm},
+ hl = #{hl},
+ jdbz = #{jdbz},
+ wbje = #{wbje},
+ je = #{je},
+ spz = #{spz},
+ wldrq = #{wldrq},
+ sl = #{sl},
+ dj = #{dj},
+ bmdm = #{bmdm},
+ wldm = #{wldm},
+ xmdm = #{xmdm},
+ fzsm1 = #{fzsm1},
+ fzsm2 = #{fzsm2},
+ fzsm3 = #{fzsm3},
+ fzsm4 = #{fzsm4},
+ fzsm5 = #{fzsm5},
+ fzsm6 = #{fzsm6},
+ fzsm7 = #{fzsm7},
+ fzsm8 = #{fzsm8},
+ fzsm9 = #{fzsm9},
+ cess = #{cess},
+ fplx = #{fplx},
+ fprq = #{fprq},
+ fphfw1 = #{fphfw1},
+ fphfw2 = #{fphfw2},
+ jsfs = #{jsfs},
+ zydm = #{zydm},
+ fzdm4 = #{fzdm4},
+ fzdm5 = #{fzdm5},
+ fzdm6 = #{fzdm6},
+ fzdm7 = #{fzdm7},
+ fzdm8 = #{fzdm8},
+ fzdm9 = #{fzdm9},
+ fzdm10 = #{fzdm10},
+ wlh = #{wlh},
+ ZBID = #{zbid},
+ EDID = #{edid},
+ JFSQID = #{jfsqid},
+ fzdm11 = #{fzdm11} ,
+ fzdm12 = #{fzdm12} ,
+ fzdm13 = #{fzdm13} ,
+ fzdm14 = #{fzdm14} ,
+ fzdm15 = #{fzdm15} ,
+ fzdm16 = #{fzdm16} ,
+ fzdm17 = #{fzdm17} ,
+ fzdm18 = #{fzdm18} ,
+ fzdm19 = #{fzdm19} ,
+ fzdm20 = #{fzdm20} ,
+ fzdm21 = #{fzdm21} ,
+ fzdm22 = #{fzdm22} ,
+ fzdm23 = #{fzdm23} ,
+ fzdm24 = #{fzdm24} ,
+ fzdm25 = #{fzdm25} ,
+ fzdm26 = #{fzdm26} ,
+ fzdm27 = #{fzdm27} ,
+ fzdm28 = #{fzdm28} ,
+ fzdm29 = #{fzdm29} ,
+ fzdm30 = #{fzdm30} ,
+ idpzh = #{idpzh} ,
+ skrlx = #{skrlx} ,
+ skrmc = #{skrmc} ,
+ skrzh = #{skrzh} ,
+ skryhdm = #{skryhdm} ,
+ skryhhh = #{skryhhh} ,
+ skryhmc = #{skryhmc} ,
+ yszccy = #{yszccy} ,
+ xsflh = #{xsflh} ,
+ bxdid = #{bxdid},
+ htid = #{htid} ,
+ zckpbh = #{zckpbh} ,
+ sflx = #{sflx} ,
+ djbh = #{djbh} ,
+ hzflh = #{hzflh} ,
+ cyxfx =#{cyxfx} ,
+ dqrq = #{dqrq} ,
+ glidpznr =#{glidpznr}
+
+ where idpznr= #{idpznr}
+
+
+
+update gl_pznr set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+where idpznr= #{idpznr}
+
+
+
+update gl_pznr set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+
+ and gsdm = #{gsdm}
+ and ZTH = #{zth}
+ and kjqj = #{kjqj}
+ and pzly = #{pzly}
+ and pzh = #{pzh}
+ and kjtxdm = #{kjtxdm}
+ and pzh = #{pzlxdm}
+ and flh = #{flh}
+ and zy = #{zy}
+ and kmdm = #{kmdm}
+ and wbdm = #{wbdm}
+ and hl = #{hl}
+ and jdbz = #{jdbz}
+ and wbje = #{wbje}
+ and je = #{je}
+ and spz = #{spz}
+ and wldrq = #{wldrq}
+ and sl = #{sl}
+ and dj = #{dj}
+ and bmdm = #{bmdm}
+ and wldm = #{wldm}
+ and xmdm = #{xmdm}
+ and fzsm1 = #{fzsm1}
+ and fzsm2 = #{fzsm2}
+ and fzsm3 = #{fzsm3}
+ and fzsm4 = #{fzsm4}
+ and fzsm5 = #{fzsm5}
+ and fzsm6 = #{fzsm6}
+ and fzsm7 = #{fzsm7}
+ and fzsm8 = #{fzsm8}
+ and fzsm9 = #{fzsm9}
+ and cess = #{cess}
+ and fplx = #{fplx}
+ and fprq = #{fprq}
+ and fphfw1 = #{fphfw1}
+ and fphfw2 = #{fphfw2}
+ and jsfs = #{jsfs}
+ and zydm = #{zydm}
+ and fzdm4 = #{fzdm4}
+ and fzdm5 = #{fzdm5}
+ and fzdm6 = #{fzdm6}
+ and fzdm7 = #{fzdm7}
+ and fzdm8 = #{fzdm8}
+ and fzdm9 = #{fzdm9}
+ and fzdm10 = #{fzdm10}
+ and IDPZNR = #{idpznr}
+ and wlh = #{wlh}
+ and ZBID = #{zbid}
+ and EDID = #{edid}
+ and JFSQID = #{jfsqid}
+ and sts='Y'
+
+
+
+
+ delete from gl_pznr where idpznr = #{idpznr}
+
+
+
+
+ delete from gl_pznr where gsdm= #{gsdm} and zth=#{zth}
+ and kjqj=#{kjqj}
+ and pzh = #{pzh}
+ and idpzh = #{idpzh}
+
+
+
+
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/service/ISenderGlPznrService.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/service/ISenderGlPznrService.java
new file mode 100644
index 00000000..8d23a5b7
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/service/ISenderGlPznrService.java
@@ -0,0 +1,14 @@
+package com.hzya.frame.grpU8.nxproof.glPznr.service;
+
+
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.grpU8.nxproof.glPznr.entity.SenderGlPznrEntity;
+
+/**
+ * (GlPznr)表服务接口
+ *
+ * @author makejava
+ * @since 2024-06-20 14:14:30
+ */
+public interface ISenderGlPznrService extends IBaseService {
+}
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/service/impl/SenderGlPznrServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/service/impl/SenderGlPznrServiceImpl.java
new file mode 100644
index 00000000..91428aa6
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/service/impl/SenderGlPznrServiceImpl.java
@@ -0,0 +1,26 @@
+package com.hzya.frame.grpU8.nxproof.glPznr.service.impl;
+
+
+import com.hzya.frame.basedao.service.impl.BaseService;
+import com.hzya.frame.grpU8.nxproof.glPznr.dao.ISenderGlPznrDao;
+import com.hzya.frame.grpU8.nxproof.glPznr.entity.SenderGlPznrEntity;
+import com.hzya.frame.grpU8.nxproof.glPznr.service.ISenderGlPznrService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+/**
+ * (GlPznr)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-06-20 14:14:30
+ */
+@Service(value = "SenderGlPznrServiceImpl")
+public class SenderGlPznrServiceImpl extends BaseService implements ISenderGlPznrService {
+
+ private ISenderGlPznrDao senderGlPznrDao;
+
+ @Autowired
+ public void setSenderGlPznrDao(ISenderGlPznrDao dao) {
+ this.senderGlPznrDao = dao;
+ this.dao = dao;
+ }
+}
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/dao/ISenderGlYebDao.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/dao/ISenderGlYebDao.java
new file mode 100644
index 00000000..55ed3d5a
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/dao/ISenderGlYebDao.java
@@ -0,0 +1,80 @@
+package com.hzya.frame.grpU8.nxproof.glYeb.dao;
+
+
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.grpU8.nxproof.glYeb.entity.SenderGlYebEntity;
+
+import java.util.List;
+
+/**
+ * (gl_yeb: table)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-07-08 11:12:24
+ */
+public interface ISenderGlYebDao extends IBaseDao {
+
+ /**
+ *
+ * @content 查询余额数据 卫生院
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/7/8 13:44
+ * **/
+ List querySenderGlYebEntity(SenderGlYebEntity senderGlYebEntity);
+
+ /**
+ *
+ * @content 保存余额数据到余额日志中 卫生院
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/7/8 13:45
+ * **/
+ SenderGlYebEntity saveSenderGlYebEntity(SenderGlYebEntity senderGlYebEntity);
+
+ /**
+ *
+ * @content 更新余额数据到余额日志中 卫生院
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/7/8 13:46
+ * **/
+ SenderGlYebEntity updateSenderGlYebEntity(SenderGlYebEntity senderGlYebEntity);
+
+ /**
+ *
+ * @content 查询余额数据 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/7/8 13:55
+ * **/
+ List queryGlYebHealthBureau(SenderGlYebEntity senderGlYebEntity);
+
+ /**
+ *
+ * @content 保存余额数据 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/7/8 13:55
+ * **/
+ SenderGlYebEntity saveGlYebHealthBureau(SenderGlYebEntity senderGlYebEntity);
+
+
+
+ /**
+ *
+ * @content 删除余额数据 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/7/16 13:51
+ * **/
+ Integer deleteGlYebHealthBureau(SenderGlYebEntity senderGlYebEntity);
+
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/dao/impl/SenderGlYebDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/dao/impl/SenderGlYebDaoImpl.java
new file mode 100644
index 00000000..5f21c8a2
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/dao/impl/SenderGlYebDaoImpl.java
@@ -0,0 +1,57 @@
+package com.hzya.frame.grpU8.nxproof.glYeb.dao.impl;
+
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+import com.hzya.frame.grpU8.nxproof.glYeb.dao.ISenderGlYebDao;
+import com.hzya.frame.grpU8.nxproof.glYeb.entity.SenderGlYebEntity;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * (GlYeb)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-07-08 11:12:24
+ */
+@Repository(value = "SenderGlYebDaoImpl")
+public class SenderGlYebDaoImpl extends MybatisGenericDao implements ISenderGlYebDao {
+
+ @Override
+ @DS("#senderGlYebEntity.dataSourceCode")
+ public List querySenderGlYebEntity(SenderGlYebEntity senderGlYebEntity) {
+ return super.queryByLike(senderGlYebEntity);
+ }
+
+ @Override
+ @DS("#senderGlYebEntity.dataSourceCode")
+ public SenderGlYebEntity saveSenderGlYebEntity(SenderGlYebEntity senderGlYebEntity) {
+ return super.save(senderGlYebEntity);
+ }
+
+ @Override
+ @DS("#senderGlYebEntity.dataSourceCode")
+ public SenderGlYebEntity updateSenderGlYebEntity(SenderGlYebEntity senderGlYebEntity) {
+ return super.update(senderGlYebEntity);
+ }
+
+ @Override
+ @DS("#senderGlYebEntity.dataSourceCode")
+ public List queryGlYebHealthBureau(SenderGlYebEntity senderGlYebEntity) {
+ return super.query(senderGlYebEntity);
+ }
+
+ @Override
+ @DS("#senderGlYebEntity.dataSourceCode")
+ public SenderGlYebEntity saveGlYebHealthBureau(SenderGlYebEntity senderGlYebEntity) {
+ return super.save(senderGlYebEntity);
+ }
+
+ @Override
+ @DS("#senderGlYebEntity.dataSourceCode")
+ public Integer deleteGlYebHealthBureau(SenderGlYebEntity senderGlYebEntity) {
+ return super.delete(getSqlIdPrifx()+"SenderGlYebEntity_delete_yeb",senderGlYebEntity);
+ }
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/entity/SenderGlYebEntity.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/entity/SenderGlYebEntity.java
new file mode 100644
index 00000000..7fa05d81
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/entity/SenderGlYebEntity.java
@@ -0,0 +1,630 @@
+package com.hzya.frame.grpU8.nxproof.glYeb.entity;
+
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/**
+ * (GlYeb)实体类
+ *
+ * @author makejava
+ * @since 2024-07-08 11:12:24
+ */
+public class SenderGlYebEntity extends BaseEntity {
+
+ private String kjnd;
+ private String kmdm;
+ private String yeblx;
+ private String wbdm;
+ private String gsdm;
+ private String zth;
+ private String fzdm0;
+ private String fzdm1;
+ private String fzdm2;
+ private String fzdm3;
+ private String fzdm4;
+ private String fzdm5;
+ private String fzdm6;
+ private String fzdm7;
+ private String fzdm8;
+ private String fzdm9;
+ private String fzdm10;
+private String fzdm11;
+private String fzdm12;
+private String fzdm13;
+private String fzdm14;
+private String fzdm15;
+private String fzdm16;
+private String fzdm17;
+private String fzdm18;
+private String fzdm19;
+private String fzdm20;
+private String fzdm21;
+private String fzdm22;
+private String fzdm23;
+private String fzdm24;
+private String fzdm25;
+private String fzdm26;
+private String fzdm27;
+private String fzdm28;
+private String fzdm29;
+private String fzdm30;
+ private String zdylb;
+ private String zdydm;
+ private String ncj;
+ private String ncd;
+ private String yj1;
+ private String yd1;
+ private String yj2;
+ private String yd2;
+ private String yj3;
+ private String yd3;
+ private String yj4;
+ private String yd4;
+ private String yj5;
+ private String yd5;
+ private String yj6;
+ private String yd6;
+ private String yj7;
+ private String yd7;
+ private String yj8;
+ private String yd8;
+ private String yj9;
+ private String yd9;
+ private String yj10;
+ private String yd10;
+ private String yj11;
+ private String yd11;
+ private String yj12;
+ private String yd12;
+ private String yj13;
+ private String yd13;
+
+ private String kjtxdm;
+
+ public String getFzdm11() {
+ return fzdm11;
+ }
+
+ public void setFzdm11(String fzdm11) {
+ this.fzdm11 = fzdm11;
+ }
+
+ public String getFzdm12() {
+ return fzdm12;
+ }
+
+ public void setFzdm12(String fzdm12) {
+ this.fzdm12 = fzdm12;
+ }
+
+ public String getFzdm13() {
+ return fzdm13;
+ }
+
+ public void setFzdm13(String fzdm13) {
+ this.fzdm13 = fzdm13;
+ }
+
+ public String getFzdm14() {
+ return fzdm14;
+ }
+
+ public void setFzdm14(String fzdm14) {
+ this.fzdm14 = fzdm14;
+ }
+
+ public String getFzdm15() {
+ return fzdm15;
+ }
+
+ public void setFzdm15(String fzdm15) {
+ this.fzdm15 = fzdm15;
+ }
+
+ public String getFzdm16() {
+ return fzdm16;
+ }
+
+ public void setFzdm16(String fzdm16) {
+ this.fzdm16 = fzdm16;
+ }
+
+ public String getFzdm17() {
+ return fzdm17;
+ }
+
+ public void setFzdm17(String fzdm17) {
+ this.fzdm17 = fzdm17;
+ }
+
+ public String getFzdm18() {
+ return fzdm18;
+ }
+
+ public void setFzdm18(String fzdm18) {
+ this.fzdm18 = fzdm18;
+ }
+
+ public String getFzdm19() {
+ return fzdm19;
+ }
+
+ public void setFzdm19(String fzdm19) {
+ this.fzdm19 = fzdm19;
+ }
+
+ public String getFzdm20() {
+ return fzdm20;
+ }
+
+ public void setFzdm20(String fzdm20) {
+ this.fzdm20 = fzdm20;
+ }
+
+ public String getFzdm21() {
+ return fzdm21;
+ }
+
+ public void setFzdm21(String fzdm21) {
+ this.fzdm21 = fzdm21;
+ }
+
+ public String getFzdm22() {
+ return fzdm22;
+ }
+
+ public void setFzdm22(String fzdm22) {
+ this.fzdm22 = fzdm22;
+ }
+
+ public String getFzdm23() {
+ return fzdm23;
+ }
+
+ public void setFzdm23(String fzdm23) {
+ this.fzdm23 = fzdm23;
+ }
+
+ public String getFzdm24() {
+ return fzdm24;
+ }
+
+ public void setFzdm24(String fzdm24) {
+ this.fzdm24 = fzdm24;
+ }
+
+ public String getFzdm25() {
+ return fzdm25;
+ }
+
+ public void setFzdm25(String fzdm25) {
+ this.fzdm25 = fzdm25;
+ }
+
+ public String getFzdm26() {
+ return fzdm26;
+ }
+
+ public void setFzdm26(String fzdm26) {
+ this.fzdm26 = fzdm26;
+ }
+
+ public String getFzdm27() {
+ return fzdm27;
+ }
+
+ public void setFzdm27(String fzdm27) {
+ this.fzdm27 = fzdm27;
+ }
+
+ public String getFzdm28() {
+ return fzdm28;
+ }
+
+ public void setFzdm28(String fzdm28) {
+ this.fzdm28 = fzdm28;
+ }
+
+ public String getFzdm29() {
+ return fzdm29;
+ }
+
+ public void setFzdm29(String fzdm29) {
+ this.fzdm29 = fzdm29;
+ }
+
+ public String getFzdm30() {
+ return fzdm30;
+ }
+
+ public void setFzdm30(String fzdm30) {
+ this.fzdm30 = fzdm30;
+ }
+
+ public String getKjtxdm() {
+ return kjtxdm;
+ }
+
+ public void setKjtxdm(String kjtxdm) {
+ this.kjtxdm = kjtxdm;
+ }
+
+ public String getKjnd() {
+ return kjnd;
+ }
+
+ public void setKjnd(String kjnd) {
+ this.kjnd = kjnd;
+ }
+
+ public String getKmdm() {
+ return kmdm;
+ }
+
+ public void setKmdm(String kmdm) {
+ this.kmdm = kmdm;
+ }
+
+ public String getYeblx() {
+ return yeblx;
+ }
+
+ public void setYeblx(String yeblx) {
+ this.yeblx = yeblx;
+ }
+
+ public String getWbdm() {
+ return wbdm;
+ }
+
+ public void setWbdm(String wbdm) {
+ this.wbdm = wbdm;
+ }
+
+ public String getGsdm() {
+ return gsdm;
+ }
+
+ public void setGsdm(String gsdm) {
+ this.gsdm = gsdm;
+ }
+
+ public String getZth() {
+ return zth;
+ }
+
+ public void setZth(String zth) {
+ this.zth = zth;
+ }
+
+ public String getFzdm0() {
+ return fzdm0;
+ }
+
+ public void setFzdm0(String fzdm0) {
+ this.fzdm0 = fzdm0;
+ }
+
+ public String getFzdm1() {
+ return fzdm1;
+ }
+
+ public void setFzdm1(String fzdm1) {
+ this.fzdm1 = fzdm1;
+ }
+
+ public String getFzdm2() {
+ return fzdm2;
+ }
+
+ public void setFzdm2(String fzdm2) {
+ this.fzdm2 = fzdm2;
+ }
+
+ public String getFzdm3() {
+ return fzdm3;
+ }
+
+ public void setFzdm3(String fzdm3) {
+ this.fzdm3 = fzdm3;
+ }
+
+ public String getFzdm4() {
+ return fzdm4;
+ }
+
+ public void setFzdm4(String fzdm4) {
+ this.fzdm4 = fzdm4;
+ }
+
+ public String getFzdm5() {
+ return fzdm5;
+ }
+
+ public void setFzdm5(String fzdm5) {
+ this.fzdm5 = fzdm5;
+ }
+
+ public String getFzdm6() {
+ return fzdm6;
+ }
+
+ public void setFzdm6(String fzdm6) {
+ this.fzdm6 = fzdm6;
+ }
+
+ public String getFzdm7() {
+ return fzdm7;
+ }
+
+ public void setFzdm7(String fzdm7) {
+ this.fzdm7 = fzdm7;
+ }
+
+ public String getFzdm8() {
+ return fzdm8;
+ }
+
+ public void setFzdm8(String fzdm8) {
+ this.fzdm8 = fzdm8;
+ }
+
+ public String getFzdm9() {
+ return fzdm9;
+ }
+
+ public void setFzdm9(String fzdm9) {
+ this.fzdm9 = fzdm9;
+ }
+
+ public String getFzdm10() {
+ return fzdm10;
+ }
+
+ public void setFzdm10(String fzdm10) {
+ this.fzdm10 = fzdm10;
+ }
+
+ public String getZdylb() {
+ return zdylb;
+ }
+
+ public void setZdylb(String zdylb) {
+ this.zdylb = zdylb;
+ }
+
+ public String getZdydm() {
+ return zdydm;
+ }
+
+ public void setZdydm(String zdydm) {
+ this.zdydm = zdydm;
+ }
+
+ public String getNcj() {
+ return ncj;
+ }
+
+ public void setNcj(String ncj) {
+ this.ncj = ncj;
+ }
+
+ public String getNcd() {
+ return ncd;
+ }
+
+ public void setNcd(String ncd) {
+ this.ncd = ncd;
+ }
+
+ public String getYj1() {
+ return yj1;
+ }
+
+ public void setYj1(String yj1) {
+ this.yj1 = yj1;
+ }
+
+ public String getYd1() {
+ return yd1;
+ }
+
+ public void setYd1(String yd1) {
+ this.yd1 = yd1;
+ }
+
+ public String getYj2() {
+ return yj2;
+ }
+
+ public void setYj2(String yj2) {
+ this.yj2 = yj2;
+ }
+
+ public String getYd2() {
+ return yd2;
+ }
+
+ public void setYd2(String yd2) {
+ this.yd2 = yd2;
+ }
+
+ public String getYj3() {
+ return yj3;
+ }
+
+ public void setYj3(String yj3) {
+ this.yj3 = yj3;
+ }
+
+ public String getYd3() {
+ return yd3;
+ }
+
+ public void setYd3(String yd3) {
+ this.yd3 = yd3;
+ }
+
+ public String getYj4() {
+ return yj4;
+ }
+
+ public void setYj4(String yj4) {
+ this.yj4 = yj4;
+ }
+
+ public String getYd4() {
+ return yd4;
+ }
+
+ public void setYd4(String yd4) {
+ this.yd4 = yd4;
+ }
+
+ public String getYj5() {
+ return yj5;
+ }
+
+ public void setYj5(String yj5) {
+ this.yj5 = yj5;
+ }
+
+ public String getYd5() {
+ return yd5;
+ }
+
+ public void setYd5(String yd5) {
+ this.yd5 = yd5;
+ }
+
+ public String getYj6() {
+ return yj6;
+ }
+
+ public void setYj6(String yj6) {
+ this.yj6 = yj6;
+ }
+
+ public String getYd6() {
+ return yd6;
+ }
+
+ public void setYd6(String yd6) {
+ this.yd6 = yd6;
+ }
+
+ public String getYj7() {
+ return yj7;
+ }
+
+ public void setYj7(String yj7) {
+ this.yj7 = yj7;
+ }
+
+ public String getYd7() {
+ return yd7;
+ }
+
+ public void setYd7(String yd7) {
+ this.yd7 = yd7;
+ }
+
+ public String getYj8() {
+ return yj8;
+ }
+
+ public void setYj8(String yj8) {
+ this.yj8 = yj8;
+ }
+
+ public String getYd8() {
+ return yd8;
+ }
+
+ public void setYd8(String yd8) {
+ this.yd8 = yd8;
+ }
+
+ public String getYj9() {
+ return yj9;
+ }
+
+ public void setYj9(String yj9) {
+ this.yj9 = yj9;
+ }
+
+ public String getYd9() {
+ return yd9;
+ }
+
+ public void setYd9(String yd9) {
+ this.yd9 = yd9;
+ }
+
+ public String getYj10() {
+ return yj10;
+ }
+
+ public void setYj10(String yj10) {
+ this.yj10 = yj10;
+ }
+
+ public String getYd10() {
+ return yd10;
+ }
+
+ public void setYd10(String yd10) {
+ this.yd10 = yd10;
+ }
+
+ public String getYj11() {
+ return yj11;
+ }
+
+ public void setYj11(String yj11) {
+ this.yj11 = yj11;
+ }
+
+ public String getYd11() {
+ return yd11;
+ }
+
+ public void setYd11(String yd11) {
+ this.yd11 = yd11;
+ }
+
+ public String getYj12() {
+ return yj12;
+ }
+
+ public void setYj12(String yj12) {
+ this.yj12 = yj12;
+ }
+
+ public String getYd12() {
+ return yd12;
+ }
+
+ public void setYd12(String yd12) {
+ this.yd12 = yd12;
+ }
+
+ public String getYj13() {
+ return yj13;
+ }
+
+ public void setYj13(String yj13) {
+ this.yj13 = yj13;
+ }
+
+ public String getYd13() {
+ return yd13;
+ }
+
+ public void setYd13(String yd13) {
+ this.yd13 = yd13;
+ }
+
+
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/entity/SenderGlYebEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/entity/SenderGlYebEntity.xml
new file mode 100644
index 00000000..0ccb97c6
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/entity/SenderGlYebEntity.xml
@@ -0,0 +1,732 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ kjnd
+ ,kmdm
+ ,yeblx
+ ,wbdm
+ ,gsdm
+ ,ZTH
+ ,fzdm0
+ ,fzdm1
+ ,fzdm2
+ ,fzdm3
+ ,fzdm4
+ ,fzdm5
+ ,fzdm6
+ ,fzdm7
+ ,fzdm8
+ ,fzdm9
+ ,fzdm10
+ ,fzdm11
+ ,fzdm12
+ ,fzdm13
+ ,fzdm14
+ ,fzdm15
+ ,fzdm16
+ ,fzdm17
+ ,fzdm18
+ ,fzdm19
+ ,fzdm20
+ ,fzdm21
+ ,fzdm22
+ ,fzdm23
+ ,fzdm24
+ ,fzdm25
+ ,fzdm26
+ ,fzdm27
+ ,fzdm28
+ ,fzdm29
+ ,fzdm30
+ ,zdylb
+ ,zdydm
+ ,ncj
+ ,ncd
+ ,yj1
+ ,yd1
+ ,yj2
+ ,yd2
+ ,yj3
+ ,yd3
+ ,yj4
+ ,yd4
+ ,yj5
+ ,yd5
+ ,yj6
+ ,yd6
+ ,yj7
+ ,yd7
+ ,yj8
+ ,yd8
+ ,yj9
+ ,yd9
+ ,yj10
+ ,yd10
+ ,yj11
+ ,yd11
+ ,yj12
+ ,yd12
+ ,yj13
+ ,yd13
+ ,ID
+ ,kjtxdm
+
+
+
+ select
+
+ from gl_yeb
+
+ and kjnd = #{kjnd}
+ and kmdm = #{kmdm}
+ and yeblx = #{yeblx}
+ and wbdm = #{wbdm}
+ and gsdm = #{gsdm}
+ and ZTH = #{zth}
+ and fzdm0 = #{fzdm0}
+ and fzdm1 = #{fzdm1}
+ and fzdm2 = #{fzdm2}
+ and fzdm3 = #{fzdm3}
+ and fzdm4 = #{fzdm4}
+ and fzdm5 = #{fzdm5}
+ and fzdm6 = #{fzdm6}
+ and fzdm7 = #{fzdm7}
+ and fzdm8 = #{fzdm8}
+ and fzdm9 = #{fzdm9}
+ and fzdm10 = #{fzdm10}
+ and zdylb = #{zdylb}
+ and zdydm = #{zdydm}
+ and ncj = #{ncj}
+ and ncd = #{ncd}
+ and yj1 = #{yj1}
+ and yd1 = #{yd1}
+ and yj2 = #{yj2}
+ and yd2 = #{yd2}
+ and yj3 = #{yj3}
+ and yd3 = #{yd3}
+ and yj4 = #{yj4}
+ and yd4 = #{yd4}
+ and yj5 = #{yj5}
+ and yd5 = #{yd5}
+ and yj6 = #{yj6}
+ and yd6 = #{yd6}
+ and yj7 = #{yj7}
+ and yd7 = #{yd7}
+ and yj8 = #{yj8}
+ and yd8 = #{yd8}
+ and yj9 = #{yj9}
+ and yd9 = #{yd9}
+ and yj10 = #{yj10}
+ and yd10 = #{yd10}
+ and yj11 = #{yj11}
+ and yd11 = #{yd11}
+ and yj12 = #{yj12}
+ and yd12 = #{yd12}
+ and yj13 = #{yj13}
+ and yd13 = #{yd13}
+ and ID = #{id}
+ -- and zth in ('004','005','009','010','011','012','014')
+
+
+
+
+
+ select count(1) from gl_yeb
+
+ and kjnd = #{kjnd}
+ and kmdm = #{kmdm}
+ and yeblx = #{yeblx}
+ and wbdm = #{wbdm}
+ and gsdm = #{gsdm}
+ and ZTH = #{zth}
+ and fzdm0 = #{fzdm0}
+ and fzdm1 = #{fzdm1}
+ and fzdm2 = #{fzdm2}
+ and fzdm3 = #{fzdm3}
+ and fzdm4 = #{fzdm4}
+ and fzdm5 = #{fzdm5}
+ and fzdm6 = #{fzdm6}
+ and fzdm7 = #{fzdm7}
+ and fzdm8 = #{fzdm8}
+ and fzdm9 = #{fzdm9}
+ and fzdm10 = #{fzdm10}
+ and zdylb = #{zdylb}
+ and zdydm = #{zdydm}
+ and ncj = #{ncj}
+ and ncd = #{ncd}
+ and yj1 = #{yj1}
+ and yd1 = #{yd1}
+ and yj2 = #{yj2}
+ and yd2 = #{yd2}
+ and yj3 = #{yj3}
+ and yd3 = #{yd3}
+ and yj4 = #{yj4}
+ and yd4 = #{yd4}
+ and yj5 = #{yj5}
+ and yd5 = #{yd5}
+ and yj6 = #{yj6}
+ and yd6 = #{yd6}
+ and yj7 = #{yj7}
+ and yd7 = #{yd7}
+ and yj8 = #{yj8}
+ and yd8 = #{yd8}
+ and yj9 = #{yj9}
+ and yd9 = #{yd9}
+ and yj10 = #{yj10}
+ and yd10 = #{yd10}
+ and yj11 = #{yj11}
+ and yd11 = #{yd11}
+ and yj12 = #{yj12}
+ and yd12 = #{yd12}
+ and yj13 = #{yj13}
+ and yd13 = #{yd13}
+ and ID = #{id}
+
+
+
+
+
+ select
+
+ from gl_yeb
+
+ and kjnd like concat('%',#{kjnd},'%')
+ and kmdm like concat('%',#{kmdm},'%')
+ and yeblx like concat('%',#{yeblx},'%')
+ and wbdm like concat('%',#{wbdm},'%')
+ and gsdm like concat('%',#{gsdm},'%')
+ and ZTH like concat('%',#{zth},'%')
+ and fzdm0 like concat('%',#{fzdm0},'%')
+ and fzdm1 like concat('%',#{fzdm1},'%')
+ and fzdm2 like concat('%',#{fzdm2},'%')
+ and fzdm3 like concat('%',#{fzdm3},'%')
+ and fzdm4 like concat('%',#{fzdm4},'%')
+ and fzdm5 like concat('%',#{fzdm5},'%')
+ and fzdm6 like concat('%',#{fzdm6},'%')
+ and fzdm7 like concat('%',#{fzdm7},'%')
+ and fzdm8 like concat('%',#{fzdm8},'%')
+ and fzdm9 like concat('%',#{fzdm9},'%')
+ and fzdm10 like concat('%',#{fzdm10},'%')
+ and zdylb like concat('%',#{zdylb},'%')
+ and zdydm like concat('%',#{zdydm},'%')
+ and ncj like concat('%',#{ncj},'%')
+ and ncd like concat('%',#{ncd},'%')
+ and yj1 like concat('%',#{yj1},'%')
+ and yd1 like concat('%',#{yd1},'%')
+ and yj2 like concat('%',#{yj2},'%')
+ and yd2 like concat('%',#{yd2},'%')
+ and yj3 like concat('%',#{yj3},'%')
+ and yd3 like concat('%',#{yd3},'%')
+ and yj4 like concat('%',#{yj4},'%')
+ and yd4 like concat('%',#{yd4},'%')
+ and yj5 like concat('%',#{yj5},'%')
+ and yd5 like concat('%',#{yd5},'%')
+ and yj6 like concat('%',#{yj6},'%')
+ and yd6 like concat('%',#{yd6},'%')
+ and yj7 like concat('%',#{yj7},'%')
+ and yd7 like concat('%',#{yd7},'%')
+ and yj8 like concat('%',#{yj8},'%')
+ and yd8 like concat('%',#{yd8},'%')
+ and yj9 like concat('%',#{yj9},'%')
+ and yd9 like concat('%',#{yd9},'%')
+ and yj10 like concat('%',#{yj10},'%')
+ and yd10 like concat('%',#{yd10},'%')
+ and yj11 like concat('%',#{yj11},'%')
+ and yd11 like concat('%',#{yd11},'%')
+ and yj12 like concat('%',#{yj12},'%')
+ and yd12 like concat('%',#{yd12},'%')
+ and yj13 like concat('%',#{yj13},'%')
+ and yd13 like concat('%',#{yd13},'%')
+ and ID like concat('%',#{id},'%')
+
+
+
+
+
+ select
+
+ from gl_yeb
+
+ or kjnd = #{kjnd}
+ or kmdm = #{kmdm}
+ or yeblx = #{yeblx}
+ or wbdm = #{wbdm}
+ or gsdm = #{gsdm}
+ or ZTH = #{zth}
+ or fzdm0 = #{fzdm0}
+ or fzdm1 = #{fzdm1}
+ or fzdm2 = #{fzdm2}
+ or fzdm3 = #{fzdm3}
+ or fzdm4 = #{fzdm4}
+ or fzdm5 = #{fzdm5}
+ or fzdm6 = #{fzdm6}
+ or fzdm7 = #{fzdm7}
+ or fzdm8 = #{fzdm8}
+ or fzdm9 = #{fzdm9}
+ or fzdm10 = #{fzdm10}
+ or zdylb = #{zdylb}
+ or zdydm = #{zdydm}
+ or ncj = #{ncj}
+ or ncd = #{ncd}
+ or yj1 = #{yj1}
+ or yd1 = #{yd1}
+ or yj2 = #{yj2}
+ or yd2 = #{yd2}
+ or yj3 = #{yj3}
+ or yd3 = #{yd3}
+ or yj4 = #{yj4}
+ or yd4 = #{yd4}
+ or yj5 = #{yj5}
+ or yd5 = #{yd5}
+ or yj6 = #{yj6}
+ or yd6 = #{yd6}
+ or yj7 = #{yj7}
+ or yd7 = #{yd7}
+ or yj8 = #{yj8}
+ or yd8 = #{yd8}
+ or yj9 = #{yj9}
+ or yd9 = #{yd9}
+ or yj10 = #{yj10}
+ or yd10 = #{yd10}
+ or yj11 = #{yj11}
+ or yd11 = #{yd11}
+ or yj12 = #{yj12}
+ or yd12 = #{yd12}
+ or yj13 = #{yj13}
+ or yd13 = #{yd13}
+ or ID = #{id}
+
+
+
+
+
+ insert into gl_yeb(
+
+ kjnd ,
+ kmdm ,
+ yeblx ,
+ wbdm ,
+ gsdm ,
+ ZTH ,
+ fzdm0 ,
+ fzdm1 ,
+ fzdm2 ,
+ fzdm3 ,
+ fzdm4 ,
+ fzdm5 ,
+ fzdm6 ,
+ fzdm7 ,
+ fzdm8 ,
+ fzdm9 ,
+ fzdm10 ,
+ fzdm11 ,
+ fzdm12 ,
+ fzdm13 ,
+ fzdm14 ,
+ fzdm15 ,
+ fzdm16 ,
+ fzdm17 ,
+ fzdm18 ,
+ fzdm19 ,
+ fzdm20 ,
+ fzdm21 ,
+ fzdm22 ,
+ fzdm23 ,
+ fzdm24 ,
+ fzdm25 ,
+ fzdm26 ,
+ fzdm27 ,
+ fzdm28 ,
+ fzdm29 ,
+ fzdm30 ,
+ zdylb ,
+ zdydm ,
+ ncj ,
+ ncd ,
+ yj1 ,
+ yd1 ,
+ yj2 ,
+ yd2 ,
+ yj3 ,
+ yd3 ,
+ yj4 ,
+ yd4 ,
+ yj5 ,
+ yd5 ,
+ yj6 ,
+ yd6 ,
+ yj7 ,
+ yd7 ,
+ yj8 ,
+ yd8 ,
+ yj9 ,
+ yd9 ,
+ yj10 ,
+ yd10 ,
+ yj11 ,
+ yd11 ,
+ yj12 ,
+ yd12 ,
+ yj13 ,
+ yd13,
+ kjtxdm
+
+ )values(
+
+ #{kjnd} ,
+ #{kmdm} ,
+ #{yeblx} ,
+ #{wbdm} ,
+ #{gsdm} ,
+ #{zth} ,
+ #{fzdm0} ,
+ #{fzdm1} ,
+ #{fzdm2} ,
+ #{fzdm3} ,
+ #{fzdm4} ,
+ #{fzdm5} ,
+ #{fzdm6} ,
+ #{fzdm7} ,
+ #{fzdm8} ,
+ #{fzdm9} ,
+ #{fzdm10} ,
+ #{fzdm11} ,
+ #{fzdm12} ,
+ #{fzdm13} ,
+ #{fzdm14} ,
+ #{fzdm15} ,
+ #{fzdm16} ,
+ #{fzdm17} ,
+ #{fzdm18} ,
+ #{fzdm19} ,
+ #{fzdm20} ,
+ #{fzdm21} ,
+ #{fzdm22} ,
+ #{fzdm23} ,
+ #{fzdm24} ,
+ #{fzdm25} ,
+ #{fzdm26} ,
+ #{fzdm27} ,
+ #{fzdm28} ,
+ #{fzdm29} ,
+ #{fzdm30} ,
+ #{zdylb} ,
+ #{zdydm} ,
+ #{ncj} ,
+ #{ncd} ,
+ #{yj1} ,
+ #{yd1} ,
+ #{yj2} ,
+ #{yd2} ,
+ #{yj3} ,
+ #{yd3} ,
+ #{yj4} ,
+ #{yd4} ,
+ #{yj5} ,
+ #{yd5} ,
+ #{yj6} ,
+ #{yd6} ,
+ #{yj7} ,
+ #{yd7} ,
+ #{yj8} ,
+ #{yd8} ,
+ #{yj9} ,
+ #{yd9} ,
+ #{yj10} ,
+ #{yd10} ,
+ #{yj11} ,
+ #{yd11} ,
+ #{yj12} ,
+ #{yd12} ,
+ #{yj13} ,
+ #{yd13},
+ #{kjtxdm}
+
+ )
+
+
+
+ insert into gl_yeb(kjnd, kmdm, yeblx, wbdm, gsdm, ZTH, fzdm0, fzdm1, fzdm2, fzdm3, fzdm4, fzdm5, fzdm6, fzdm7, fzdm8, fzdm9, fzdm10, zdylb, zdydm, ncj, ncd, yj1, yd1, yj2, yd2, yj3, yd3, yj4, yd4, yj5, yd5, yj6, yd6, yj7, yd7, yj8, yd8, yj9, yd9, yj10, yd10, yj11, yd11, yj12, yd12, yj13, yd13, ID)
+ values
+
+ (#{entity.kjnd},#{entity.kmdm},#{entity.yeblx},#{entity.wbdm},#{entity.gsdm},#{entity.zth},#{entity.fzdm0},#{entity.fzdm1},#{entity.fzdm2},#{entity.fzdm3},#{entity.fzdm4},#{entity.fzdm5},#{entity.fzdm6},#{entity.fzdm7},#{entity.fzdm8},#{entity.fzdm9},#{entity.fzdm10},#{entity.zdylb},#{entity.zdydm},#{entity.ncj},#{entity.ncd},#{entity.yj1},#{entity.yd1},#{entity.yj2},#{entity.yd2},#{entity.yj3},#{entity.yd3},#{entity.yj4},#{entity.yd4},#{entity.yj5},#{entity.yd5},#{entity.yj6},#{entity.yd6},#{entity.yj7},#{entity.yd7},#{entity.yj8},#{entity.yd8},#{entity.yj9},#{entity.yd9},#{entity.yj10},#{entity.yd10},#{entity.yj11},#{entity.yd11},#{entity.yj12},#{entity.yd12},#{entity.yj13},#{entity.yd13},#{entity.id})
+
+
+
+
+ insert into gl_yeb(kjnd, kmdm, yeblx, wbdm, gsdm, ZTH, fzdm0, fzdm1, fzdm2, fzdm3, fzdm4, fzdm5, fzdm6, fzdm7, fzdm8, fzdm9, fzdm10, zdylb, zdydm, ncj, ncd, yj1, yd1, yj2, yd2, yj3, yd3, yj4, yd4, yj5, yd5, yj6, yd6, yj7, yd7, yj8, yd8, yj9, yd9, yj10, yd10, yj11, yd11, yj12, yd12, yj13, yd13, ID)
+ values
+
+ (#{entity.kjnd},#{entity.kmdm},#{entity.yeblx},#{entity.wbdm},#{entity.gsdm},#{entity.zth},#{entity.fzdm0},#{entity.fzdm1},#{entity.fzdm2},#{entity.fzdm3},#{entity.fzdm4},#{entity.fzdm5},#{entity.fzdm6},#{entity.fzdm7},#{entity.fzdm8},#{entity.fzdm9},#{entity.fzdm10},#{entity.zdylb},#{entity.zdydm},#{entity.ncj},#{entity.ncd},#{entity.yj1},#{entity.yd1},#{entity.yj2},#{entity.yd2},#{entity.yj3},#{entity.yd3},#{entity.yj4},#{entity.yd4},#{entity.yj5},#{entity.yd5},#{entity.yj6},#{entity.yd6},#{entity.yj7},#{entity.yd7},#{entity.yj8},#{entity.yd8},#{entity.yj9},#{entity.yd9},#{entity.yj10},#{entity.yd10},#{entity.yj11},#{entity.yd11},#{entity.yj12},#{entity.yd12},#{entity.yj13},#{entity.yd13},#{entity.id})
+
+ on duplicate key update
+ kjnd = values(kjnd),
+ kmdm = values(kmdm),
+ yeblx = values(yeblx),
+ wbdm = values(wbdm),
+ gsdm = values(gsdm),
+ ZTH = values(ZTH),
+ fzdm0 = values(fzdm0),
+ fzdm1 = values(fzdm1),
+ fzdm2 = values(fzdm2),
+ fzdm3 = values(fzdm3),
+ fzdm4 = values(fzdm4),
+ fzdm5 = values(fzdm5),
+ fzdm6 = values(fzdm6),
+ fzdm7 = values(fzdm7),
+ fzdm8 = values(fzdm8),
+ fzdm9 = values(fzdm9),
+ fzdm10 = values(fzdm10),
+ zdylb = values(zdylb),
+ zdydm = values(zdydm),
+ ncj = values(ncj),
+ ncd = values(ncd),
+ yj1 = values(yj1),
+ yd1 = values(yd1),
+ yj2 = values(yj2),
+ yd2 = values(yd2),
+ yj3 = values(yj3),
+ yd3 = values(yd3),
+ yj4 = values(yj4),
+ yd4 = values(yd4),
+ yj5 = values(yj5),
+ yd5 = values(yd5),
+ yj6 = values(yj6),
+ yd6 = values(yd6),
+ yj7 = values(yj7),
+ yd7 = values(yd7),
+ yj8 = values(yj8),
+ yd8 = values(yd8),
+ yj9 = values(yj9),
+ yd9 = values(yd9),
+ yj10 = values(yj10),
+ yd10 = values(yd10),
+ yj11 = values(yj11),
+ yd11 = values(yd11),
+ yj12 = values(yj12),
+ yd12 = values(yd12),
+ yj13 = values(yj13),
+ yd13 = values(yd13),
+ ID = values(ID)
+
+
+ update gl_yeb set
+
+ kjnd = #{kjnd},
+ kmdm = #{kmdm},
+ yeblx = #{yeblx},
+ wbdm = #{wbdm},
+ gsdm = #{gsdm},
+ ZTH = #{zth},
+ fzdm0 = #{fzdm0},
+ fzdm1 = #{fzdm1},
+ fzdm2 = #{fzdm2},
+ fzdm3 = #{fzdm3},
+ fzdm4 = #{fzdm4},
+ fzdm5 = #{fzdm5},
+ fzdm6 = #{fzdm6},
+ fzdm7 = #{fzdm7},
+ fzdm8 = #{fzdm8},
+ fzdm9 = #{fzdm9},
+ fzdm10 = #{fzdm10},
+ fzdm11 = #{fzdm11},
+ fzdm12 = #{fzdm12},
+ fzdm13 = #{fzdm13},
+ fzdm14 = #{fzdm14},
+ fzdm15 = #{fzdm15},
+ fzdm16 = #{fzdm16},
+ fzdm17 = #{fzdm17},
+ fzdm18 = #{fzdm18},
+ fzdm19 = #{fzdm19},
+ fzdm20 = #{fzdm20},
+ fzdm21 = #{fzdm21},
+ fzdm22 = #{fzdm22},
+ fzdm23 = #{fzdm23},
+ fzdm24 = #{fzdm24},
+ fzdm25 = #{fzdm25},
+ fzdm26 = #{fzdm26},
+ fzdm27 = #{fzdm27},
+ fzdm28 = #{fzdm28},
+ fzdm29 = #{fzdm29},
+ fzdm30 = #{fzdm30},
+ zdylb = #{zdylb},
+ zdydm = #{zdydm},
+ ncj = #{ncj},
+ ncd = #{ncd},
+ yj1 = #{yj1},
+ yd1 = #{yd1},
+ yj2 = #{yj2},
+ yd2 = #{yd2},
+ yj3 = #{yj3},
+ yd3 = #{yd3},
+ yj4 = #{yj4},
+ yd4 = #{yd4},
+ yj5 = #{yj5},
+ yd5 = #{yd5},
+ yj6 = #{yj6},
+ yd6 = #{yd6},
+ yj7 = #{yj7},
+ yd7 = #{yd7},
+ yj8 = #{yj8},
+ yd8 = #{yd8},
+ yj9 = #{yj9},
+ yd9 = #{yd9},
+ yj10 = #{yj10},
+ yd10 = #{yd10},
+ yj11 = #{yj11},
+ yd11 = #{yd11},
+ yj12 = #{yj12},
+ yd12 = #{yd12},
+ yj13 = #{yj13},
+ yd13 = #{yd13},
+ kjtxdm = #{kjtxdm}
+
+ where ID = #{id}
+
+
+
+update gl_yeb set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+where ID = #{id}
+
+
+
+update gl_yeb set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+
+ and kjnd = #{kjnd}
+ and kmdm = #{kmdm}
+ and yeblx = #{yeblx}
+ and wbdm = #{wbdm}
+ and gsdm = #{gsdm}
+ and ZTH = #{zth}
+ and fzdm0 = #{fzdm0}
+ and fzdm1 = #{fzdm1}
+ and fzdm2 = #{fzdm2}
+ and fzdm3 = #{fzdm3}
+ and fzdm4 = #{fzdm4}
+ and fzdm5 = #{fzdm5}
+ and fzdm6 = #{fzdm6}
+ and fzdm7 = #{fzdm7}
+ and fzdm8 = #{fzdm8}
+ and fzdm9 = #{fzdm9}
+ and fzdm10 = #{fzdm10}
+ and zdylb = #{zdylb}
+ and zdydm = #{zdydm}
+ and ncj = #{ncj}
+ and ncd = #{ncd}
+ and yj1 = #{yj1}
+ and yd1 = #{yd1}
+ and yj2 = #{yj2}
+ and yd2 = #{yd2}
+ and yj3 = #{yj3}
+ and yd3 = #{yd3}
+ and yj4 = #{yj4}
+ and yd4 = #{yd4}
+ and yj5 = #{yj5}
+ and yd5 = #{yd5}
+ and yj6 = #{yj6}
+ and yd6 = #{yd6}
+ and yj7 = #{yj7}
+ and yd7 = #{yd7}
+ and yj8 = #{yj8}
+ and yd8 = #{yd8}
+ and yj9 = #{yj9}
+ and yd9 = #{yd9}
+ and yj10 = #{yj10}
+ and yd10 = #{yd10}
+ and yj11 = #{yj11}
+ and yd11 = #{yd11}
+ and yj12 = #{yj12}
+ and yd12 = #{yd12}
+ and yj13 = #{yj13}
+ and yd13 = #{yd13}
+ and ID = #{id}
+ and kjtxdm = #{kjtxdm}
+
+
+
+
+ delete from gl_yeb where ID = #{id}
+
+
+
+
+
+ delete from gl_yeb where kjnd = #{kjnd} and gsdm=#{gsdm} and zth=#{zth}
+ and kmdm = #{kmdm}
+
+
+
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/service/ISenderGlYebService.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/service/ISenderGlYebService.java
new file mode 100644
index 00000000..e8e260ec
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/service/ISenderGlYebService.java
@@ -0,0 +1,69 @@
+package com.hzya.frame.grpU8.nxproof.glYeb.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.grpU8.nxproof.glYeb.entity.SenderGlYebEntity;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+import java.util.List;
+
+
+/**
+ * (GlYeb)表服务接口
+ *
+ * @author makejava
+ * @since 2024-07-08 11:12:24
+ */
+public interface ISenderGlYebService extends IBaseService {
+
+ /**
+ *
+ * @content 同步余额数据 卫生院
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/7/8 11:47
+ * **/
+ Object glYebSynchronization(JSONObject json);
+
+ /**
+ *
+ * @content 查询余额数据 卫生院
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/7/8 11:49
+ * **/
+ Object queryEntityPage(JSONObject json);
+
+ /**
+ *
+ * @content 查询余额数据 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/7/8 13:50
+ * **/
+ List queryEntityPageHealthBureau(SenderGlYebEntity senderGlYebEntity);
+
+ /**
+ *
+ * @content 保存余额数据 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/7/8 13:51
+ * **/
+ Object saveEntityHealthBureau(JSONObject jsonObject);
+
+
+ /**
+ *
+ * @content 删除余额数据 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/7/16 13:48
+ * **/
+ Object deleteEntityHealthBureau(JSONObject jsonObject);
+}
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/service/impl/SenderGlYebServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/service/impl/SenderGlYebServiceImpl.java
new file mode 100644
index 00000000..41f4bbc8
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glYeb/service/impl/SenderGlYebServiceImpl.java
@@ -0,0 +1,363 @@
+package com.hzya.frame.grpU8.nxproof.glYeb.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageInfo;
+import com.hzya.frame.basedao.service.impl.BaseService;
+import com.hzya.frame.grpU8.nxproof.glYeb.dao.ISenderGlYebDao;
+import com.hzya.frame.grpU8.nxproof.glYeb.entity.SenderGlYebEntity;
+import com.hzya.frame.grpU8.nxproof.glYeb.service.ISenderGlYebService;
+import com.hzya.frame.grpU8.nxproof.glxmzl.entity.SenderGlXmzlEntity;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.apache.commons.collections.CollectionUtils;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * (GlYeb)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-07-08 11:12:24
+ */
+@Service(value = "SenderGlYebServiceImpl")
+public class SenderGlYebServiceImpl extends BaseService implements ISenderGlYebService {
+
+
+ private ISenderGlYebDao senderGlYebDao;
+
+
+
+ @Autowired
+ public void setSenderGlYebDao(ISenderGlYebDao dao) {
+ this.senderGlYebDao = dao;
+ this.dao = dao;
+ }
+
+ //同步余额数据
+ @Override
+ public Object glYebSynchronization(JSONObject json) {
+ JSONObject jsonObject = json.getJSONObject("jsonStr");
+ SenderGlYebEntity senderGlYebEntity = jsonObject.toJavaObject(SenderGlYebEntity.class);
+ List senderGlYebEntities=new ArrayList<>();
+ String result=null;
+ try {
+ //如果没有传入年度,则查询当年得,避免数据查询太大
+ if(senderGlYebEntity.getKjnd()==null){
+ senderGlYebEntity.setKjnd(DateUtil.format(new Date(),"yyyy"));
+ }
+ /*try {
+ //同步南浔区人民医院001余额数据
+ senderGlYebEntity.setZth("001");
+ senderGlYebEntity.setGsdm("0101010101");
+ // senderGlYebEntity.setKmdm("1002010101");
+ logger.info("================开始查询南浔区人民医院余额表数据=================");
+ senderGlYebEntities= sqlSessionNxrm.selectList("SenderGlYebEntity_list_base",senderGlYebEntity);
+ result =sendYebToHealthBureauTwo(senderGlYebEntities);
+ logger.info("南浔区人民医院GRPU8余额数据同步结果为:{}",result);
+ }catch (Exception e){
+ logger.info("南浔区人民医院GRPU8余额数据同步失败:{}",e.getMessage());
+ e.printStackTrace();
+ }*/
+ try {
+ //同步南浔区练市人民医院003余额数据
+ senderGlYebEntity.setZth("003");
+ senderGlYebEntity.setGsdm("0101010103");
+ logger.info("================开始查询南浔区练市人民医院余额表数据=================");
+ senderGlYebEntities= senderGlYebDao.querySenderGlYebEntity(senderGlYebEntity);
+ result =sendYebToHealthBureauTwo(senderGlYebEntities);
+ logger.info("南浔区练市人民医院GRPU8余额数据同步结果为:{}",result);
+ }catch (Exception e){
+ logger.info("南浔区练市人民医院GRPU8余额数据同步失败:{}",e.getMessage());
+ e.printStackTrace();
+ }
+ /*try {
+ //同步练市镇中心卫生院005余额数据
+ senderGlYebEntity.setZth("005");
+ senderGlYebEntity.setGsdm("0101010202");
+ logger.info("================开始查询南浔区练市镇中心卫生院余额表数据=================");
+ senderGlYebEntities= sqlSessionNxrm.selectList("SenderGlYebEntity_list_base",senderGlYebEntity);
+ result =sendYebToHealthBureauTwo(senderGlYebEntities);
+ logger.info("南浔区练市镇中心卫生院GRPU8余额数据同步结果为:{}",result);
+ }catch (Exception e){
+ logger.info("南浔区练市镇中心卫生院GRPU8余额数据同步失败:{}",e.getMessage());
+ e.printStackTrace();
+ }*/
+ /*try {
+ //同步善琏镇卫生院007余额数据
+ senderGlYebEntity.setZth("007");
+ senderGlYebEntity.setGsdm("0101010204");
+ logger.info("================开始查询南浔区善琏镇卫生院余额表数据=================");
+ senderGlYebEntities= sqlSessionNxrm.selectList("SenderGlYebEntity_list_base",senderGlYebEntity);
+ result =sendYebToHealthBureauTwo(senderGlYebEntities);
+ logger.info("南浔区善琏镇卫生院GRPU8余额数据同步结果为:{}",result);
+ }catch (Exception e){
+ logger.info("南浔区善琏镇卫生院GRPU8余额数据同步失败:{}",e.getMessage());
+ e.printStackTrace();
+ }*/
+ /*try {
+ //同步双林镇中心卫生院004余额数据
+ senderGlYebEntity.setZth("004");
+ senderGlYebEntity.setGsdm("0101010201");
+ senderGlYebEntities= sqlSessionSlz.selectList("SenderGlYebEntity_list_base",senderGlYebEntity);
+ result =sendYebToHealthBureauTwo(senderGlYebEntities);
+ logger.info("双林镇中心卫生院GRPU8余额数据同步结果为:{}",result);
+ }catch (Exception e){
+ logger.info("双林镇中心卫生院GRPU8余额数据同步失败:{}",e.getMessage());
+ e.printStackTrace();
+ }
+ try {
+ //同步菱湖镇中心卫生院009余额数据
+ senderGlYebEntity.setZth("009");
+ senderGlYebEntity.setGsdm("0101020201");
+ senderGlYebEntities= sqlSessionLhz.selectList("SenderGlYebEntity_list_base",senderGlYebEntity);
+ result =sendYebToHealthBureauTwo(senderGlYebEntities);
+ logger.info("菱湖镇中心卫生院GRPU8余额数据同步结果为:{}",result);
+ }catch (Exception e){
+ logger.info("菱湖镇中心卫生院GRPU8余额数据同步失败:{}",e.getMessage());
+ e.printStackTrace();
+ }
+ try {
+ //同步和孚镇卫生院010余额数据
+ senderGlYebEntity.setZth("010");
+ senderGlYebEntity.setGsdm("0101020202");
+ senderGlYebEntities= sqlSessionHfz.selectList("SenderGlYebEntity_list_base",senderGlYebEntity);
+ result =sendYebToHealthBureauTwo(senderGlYebEntities);
+ logger.info("和孚镇卫生院GRPU8余额数据同步结果为:{}",result);
+ }catch (Exception e){
+ logger.info("和孚镇卫生院GRPU8余额数据同步失败:{}",e.getMessage());
+ }
+ try {
+ //同步千金镇卫生院011余额数据
+ senderGlYebEntity.setZth("011");
+ senderGlYebEntity.setGsdm("0101020203");
+ senderGlYebEntities= sqlSessionQjz.selectList("SenderGlYebEntity_list_base",senderGlYebEntity);
+ result =sendYebToHealthBureauTwo(senderGlYebEntities);
+ logger.info("千金镇卫生院GRPU8余额数据同步结果为:{}",result);
+ }catch (Exception e){
+ logger.info("千金镇卫生院GRPU8余额数据同步失败:{}",e.getMessage());
+ }
+ try {
+ //同步石崇镇卫生院012余额数据
+ senderGlYebEntity.setZth("012");
+ senderGlYebEntity.setGsdm("0101020204");
+ senderGlYebEntities= sqlSessionScz.selectList("SenderGlYebEntity_list_base",senderGlYebEntity);
+ result =sendYebToHealthBureauTwo(senderGlYebEntities);
+ logger.info("石崇镇卫生院GRPU8余额数据同步结果为:{}",result);
+ }catch (Exception e){
+ logger.info("石崇镇卫生院GRPU8余额数据同步失败:{}",e.getMessage());
+ e.printStackTrace();
+ }
+ try {
+ //同步南浔镇中心卫生院014余额数据
+ senderGlYebEntity.setZth("014");
+ senderGlYebEntity.setGsdm("010202");
+ senderGlYebEntities= sqlSessionNxz.selectList("SenderGlYebEntity_list_base",senderGlYebEntity);
+ result =sendYebToHealthBureauTwo(senderGlYebEntities);
+ logger.info("南浔镇中心卫生院GRPU8余额数据同步结果为:{}",result);
+ }catch (Exception e){
+ logger.info("南浔镇中心卫生院GRPU8余额数据同步失败:{}",e.getMessage());
+ e.printStackTrace();
+ }*/
+ }catch (Exception e){
+ logger.info("卫生院GRPU8余额数据同步失败:{}",e.getMessage());
+ }
+ JSONObject jsonObject1=new JSONObject();
+ jsonObject1.put("status","200");
+ jsonObject1.put("result",result);
+ return jsonObject1;
+ }
+
+
+ private String sendYebToHealthBureauTwo(List senderGlYebEntities){
+ if (CollectionUtils.isEmpty(senderGlYebEntities)) {
+ logger.info("GRPU8没有需要同步得余额数据信息");
+ return "GRPU8没有需要同步得余额数据信息";
+ } else {
+ //先删除再保存 根据会计年度,公司代码,账套号删除
+ SenderGlYebEntity receiverGlYebEntity = new SenderGlYebEntity();
+ receiverGlYebEntity.setKjnd(senderGlYebEntities.get(0).getKjnd());
+ //receiverGlYebEntity.setKjnd("2021");
+ receiverGlYebEntity.setGsdm(senderGlYebEntities.get(0).getGsdm());
+ receiverGlYebEntity.setZth(senderGlYebEntities.get(0).getZth());
+ try {
+ JSONObject jsonObjectStr=new JSONObject();
+ jsonObjectStr.put("jsonStr",receiverGlYebEntity);
+ logger.info("========开始将卫生局得GRPU8账套号:{},公司代码:{},会计年度:{}的余额数据删除==========",senderGlYebEntities.get(0).getZth(),senderGlYebEntities.get(0).getGsdm(),senderGlYebEntities.get(0).getKjnd());
+ deleteEntityHealthBureau(jsonObjectStr);
+ logger.info("========卫生局得GRPU8账套号:{},公司代码:{},会计年度:{}的余额数据删除完毕==========",senderGlYebEntities.get(0).getZth(),senderGlYebEntities.get(0).getGsdm(),senderGlYebEntities.get(0).getKjnd());
+ }catch (Exception e){
+ logger.info("{}得GRPU8余额数据删除失败:{}", senderGlYebEntities.get(0).getZth(),e.getMessage());
+ return "卫生院GRPU8余额数据删除失败";
+ }
+ for (SenderGlYebEntity senderGlYebEntity : senderGlYebEntities) {
+ //senderGlYebEntity.setKjnd("2021");
+ JSONObject jsonObjectStrSave = new JSONObject();
+ jsonObjectStrSave.put("jsonStr", senderGlYebEntity);
+ try {
+ //保存数据
+ logger.info("========开始将账套号为:{}得GRPU8余额数据同步新增到卫生局GRPU8余额数据中==========",senderGlYebEntity.getZth());
+ saveEntityHealthBureau(jsonObjectStrSave);
+ }catch (Exception e){
+ logger.info("账套号:{}得GRPU8余额数据新增失败:{}",senderGlYebEntity.getZth(), e.getMessage());
+ e.printStackTrace();
+ }
+ }
+ return "同步卫生院GROU8余额数据成功";
+ }
+ }
+
+ //查询余额数据
+ @Override
+ public Object queryEntityPage(JSONObject json) {
+ JSONObject jsonObject = json.getJSONObject("jsonStr");
+ SenderGlYebEntity senderGlYebEntity = jsonObject.toJavaObject(SenderGlYebEntity.class);
+ List senderGlYebEntities=new ArrayList<>();
+ try {
+ //如果没有传入年度,则查询当年得,避免数据查询太大
+ if(senderGlYebEntity.getKjnd()==null){
+ senderGlYebEntity.setKjnd(String.valueOf(DateUtil.format(new Date(),"yyyy")));
+ }
+ if(StrUtil.isEmpty(senderGlYebEntity.getZth())){
+ logger.info("======根据账套号:{}查询余额数据为空",senderGlYebEntity.getZth());
+ return BaseResult.getFailureMessageEntity("请传递账套号");
+ }
+ /* switch (senderGlYebEntity.getGsdm()){
+ case "0101010103"://练市人民医院
+ senderGlYebEntities = senderGlYebDao.queryByLike(senderGlYebEntity);
+ break;
+ case "0101010201"://双林镇中心卫生院
+ senderGlYebEntities = senderGlYebDao.queryByLike(senderGlYebEntity);
+ break;
+ case "0101010202"://练市镇中心卫生院
+ senderGlYebEntities = senderGlYebDao.queryByLike(senderGlYebEntity);
+ break;
+ case "0101010204"://善琏镇卫生院
+ senderGlYebEntities = senderGlYebDao.queryByLike(senderGlYebEntity);
+ break;
+ case "0101020201":
+ senderGlYebEntities = senderGlYebDao.queryByLike(senderGlYebEntity);
+ break;
+ case "0101020202":
+ senderGlYebEntities = senderGlYebDao.queryByLike(senderGlYebEntity);
+ break;
+ case "0101020203":
+ senderGlYebEntities = senderGlYebDao.queryByLike(senderGlYebEntity);
+ break;
+ case "0101020204":
+ senderGlYebEntities = senderGlYebDao.queryByLike(senderGlYebEntity);
+ break;
+ case "0101010101"://南浔区人民医院
+ senderGlYebEntities = senderGlYebDao.queryByLike(senderGlYebEntity);
+ break;
+ default:
+ break;
+ }*/
+ senderGlYebEntities = senderGlYebDao.querySenderGlYebEntity(senderGlYebEntity);
+ PageInfo pageInfo=new PageInfo(senderGlYebEntities);
+ JSONObject jsonObject1=new JSONObject();
+ jsonObject1.put("status","200");
+ jsonObject1.put("pageInfo",pageInfo);
+ return jsonObject1;
+ }catch (Exception e){
+ logger.info("根据账套号:{}查询卫生院GROU8余额数据失败:",senderGlYebEntity.getZth(),e.getMessage());
+ return BaseResult.getFailureMessageEntity("查询余额数据失败");
+ }
+ }
+
+
+ //查询余额数据
+ @Override
+ public List queryEntityPageHealthBureau(SenderGlYebEntity senderGlYebEntity) {
+ try {
+ logger.info("====开始根据账套号:{}查询卫生局中得余额数据====",senderGlYebEntity.getZth());
+ List receiverGlYebEntities = senderGlYebDao.queryGlYebHealthBureau(senderGlYebEntity);
+ return receiverGlYebEntities;
+ }catch (Exception e){
+ logger.info("根据账套号:{}查询卫生局GRPU8余额数据错误:{}",senderGlYebEntity.getZth(),e.getMessage());
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ //保存余额数据
+ @Override
+ public Object saveEntityHealthBureau(JSONObject json) {
+ JSONObject jsonObject = json.getJSONObject("jsonStr");
+ SenderGlYebEntity receiverGlYebEntity = jsonObject.toJavaObject(SenderGlYebEntity.class);
+ if (!checkStr(jsonObject.getString("kjnd"))) {
+ logger.info("========保存余额数据时会计年度为空==========");
+ return BaseResult.getFailureMessageEntity("会计年度为空");
+ }
+ if (!checkStr(jsonObject.getString("kmdm"))) {
+ logger.info("========保存余额数据时科目代码为空==========");
+ return BaseResult.getFailureMessageEntity("科目代码为空");
+ }
+ if (!checkStr(jsonObject.getString("gsdm"))) {
+ logger.info("========保存余额数据时公司代码为空==========");
+ return BaseResult.getFailureMessageEntity("公司代码为空");
+ }
+ if (!checkStr(jsonObject.getString("zth"))) {
+ logger.info("========保存余额数据时账套号为空==========");
+ return BaseResult.getFailureMessageEntity("账套号为空");
+ }
+ try {
+ logger.info("==========根据账套号:{}开始保存余额数据=========",receiverGlYebEntity.getZth());
+ SenderGlYebEntity glYebEntity = senderGlYebDao.saveGlYebHealthBureau(receiverGlYebEntity);
+ logger.info("==========根据账套号:{}保存得余额数据id为:{}=========",receiverGlYebEntity.getZth(),glYebEntity.getId());
+ /*logger.info("=========开始保存余额中间表========");
+ receiverGlYebEntity.setJid(glYebEntity.getId());//卫生局的id
+ receiverGlYebEntity.setYid(jsonObject.getString("id")==null?String.valueOf(UUIDLong.longUUID()):jsonObject.getString("id"));//卫生院的id
+ receiverGlYebEntity.setId(String.valueOf(UUIDLong.longUUID()));//自己本身的id
+ ReceiverGlYebEntity receiverGlYeb = receiverGlYebDao.saveReceiverGlYebRelevance(receiverGlYebEntity);
+ logger.info("==========保存得余额中间表的数据id为:{}=========",receiverGlYeb.getId());*/
+ JSONObject jsonObject1=new JSONObject();
+ jsonObject1.put("status","200");
+ jsonObject1.put("yeb",glYebEntity);
+ return jsonObject1;
+ }catch (Exception e){
+ logger.info("根据账套号:{}保存卫生局GROU8余额数据失败,",receiverGlYebEntity.getZth(),e.getMessage());
+ return BaseResult.getFailureMessageEntity("保存卫生局GROU8余额数据失败");
+ }
+ }
+
+
+
+ @Override
+ public Object deleteEntityHealthBureau(JSONObject json) {
+ JSONObject jsonObject = json.getJSONObject("jsonStr");
+ SenderGlYebEntity receiverGlYebEntity = jsonObject.toJavaObject(SenderGlYebEntity.class);
+ if (!checkStr(jsonObject.getString("kjnd"))) {
+ logger.info("========保存余额数据时会计年度为空==========");
+ return BaseResult.getFailureMessageEntity("会计年度为空");
+ }
+ if (!checkStr(jsonObject.getString("gsdm"))) {
+ logger.info("========保存余额数据时公司代码为空==========");
+ return BaseResult.getFailureMessageEntity("公司代码为空");
+ }
+ if (!checkStr(jsonObject.getString("zth"))) {
+ logger.info("========保存余额数据时账套号为空==========");
+ return BaseResult.getFailureMessageEntity("账套号为空");
+ }
+ try {
+ logger.info("==========开始删除余额数据,会计年度为:{},公司代码为:{},账套号为:{},科目代码为:{}=========",
+ jsonObject.getString("kjnd"),jsonObject.getString("gsdm"),jsonObject.getString("zth"),receiverGlYebEntity.getKmdm());
+ Integer integer = senderGlYebDao.deleteGlYebHealthBureau(receiverGlYebEntity);
+ JSONObject jsonObject1=new JSONObject();
+ jsonObject1.put("status","200");
+ jsonObject1.put("yeb",integer);
+ return jsonObject1;
+ }catch (Exception e){
+ logger.info("根据账套号:{},会计年度:{}删除卫生局GROU8余额数据失败,",receiverGlYebEntity.getZth(),receiverGlYebEntity.getKjnd(),e.getMessage());
+ return BaseResult.getFailureMessageEntity("删除卫生局GROU8余额数据失败");
+ }
+ }
+}
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/dao/ISenderGlZtcsDao.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/dao/ISenderGlZtcsDao.java
new file mode 100644
index 00000000..358d1af8
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/dao/ISenderGlZtcsDao.java
@@ -0,0 +1,89 @@
+package com.hzya.frame.grpU8.nxproof.glZtcs.dao;
+
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.grpU8.nxproof.glZtcs.entity.SenderGlZtcsEntity;
+
+import java.util.List;
+
+/**
+ * (gl_ztcs: table)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-20 09:45:03
+ */
+public interface ISenderGlZtcsDao extends IBaseDao {
+ /**
+ *
+ * @content 查询账套信息 卫生院
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/20 10:11
+ * **/
+ List querySenderGlZtcsEntity(SenderGlZtcsEntity senderGlZtcsEntity);
+
+ /**
+ *
+ * @content 保存账套信息到账套日志表中 卫生院
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/27 15:33
+ * **/
+ SenderGlZtcsEntity saveSenderGlZtcsEntity(SenderGlZtcsEntity senderGlZtcsEntity);
+
+ /**
+ *
+ * @content 更新账套信息到账套日志表中 卫生院
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/27 15:36
+ * **/
+ SenderGlZtcsEntity updateSenderGlZtcsEntity(SenderGlZtcsEntity senderGlZtcsEntity);
+
+ /**
+ *
+ * @content 查询账套信息 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/20 10:11
+ * **/
+ List queryGlZtcsHealthBureau(SenderGlZtcsEntity senderGlZtcsEntity);
+
+ /**
+ *
+ * @content 保存账套信息 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/27 15:33
+ * **/
+ SenderGlZtcsEntity saveGlZtcsHealthBureau(SenderGlZtcsEntity senderGlZtcsEntity);
+
+ /**
+ *
+ * @content 更新账套信息 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/27 15:36
+ * **/
+ SenderGlZtcsEntity updateGlZtcsHealthBureau(SenderGlZtcsEntity senderGlZtcsEntity);
+
+ /**
+ *
+ * @content 删除账套信息 卫生局
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/8/9 17:23
+ * **/
+ Integer deleteGlZtcsHealthBureau(SenderGlZtcsEntity senderGlZtcsEntity);
+
+
+
+
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/dao/impl/SenderGlZtcsDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/dao/impl/SenderGlZtcsDaoImpl.java
new file mode 100644
index 00000000..6a295c99
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/dao/impl/SenderGlZtcsDaoImpl.java
@@ -0,0 +1,61 @@
+package com.hzya.frame.grpU8.nxproof.glZtcs.dao.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+import com.hzya.frame.grpU8.nxproof.glZtcs.dao.ISenderGlZtcsDao;
+import com.hzya.frame.grpU8.nxproof.glZtcs.entity.SenderGlZtcsEntity;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+/**
+ * (GlZtcs)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-20 09:45:03
+ */
+@Repository(value = "SenderGlZtcsDaoImpl")
+public class SenderGlZtcsDaoImpl extends MybatisGenericDao implements ISenderGlZtcsDao {
+
+ @Override
+ @DS("#senderGlZtcsEntity.dataSourceCode")
+ public List querySenderGlZtcsEntity(SenderGlZtcsEntity senderGlZtcsEntity) {
+ return super.queryByLike(senderGlZtcsEntity);
+ }
+ @Override
+ @DS("#senderGlZtcsEntity.dataSourceCode")
+ public SenderGlZtcsEntity saveSenderGlZtcsEntity(SenderGlZtcsEntity senderGlZtcsEntity) {
+ return super.save(senderGlZtcsEntity);
+ }
+ @Override
+ @DS("#senderGlZtcsEntity.dataSourceCode")
+ public SenderGlZtcsEntity updateSenderGlZtcsEntity(SenderGlZtcsEntity senderGlZtcsEntity) {
+ return super.update(senderGlZtcsEntity);
+ }
+
+ @Override
+ @DS("#senderGlZtcsEntity.dataSourceCode")
+ public List queryGlZtcsHealthBureau(SenderGlZtcsEntity senderGlZtcsEntity) {
+ return super.query(senderGlZtcsEntity);
+ }
+
+ @Override
+ @DS("#senderGlZtcsEntity.dataSourceCode")
+ public SenderGlZtcsEntity saveGlZtcsHealthBureau(SenderGlZtcsEntity senderGlZtcsEntity) {
+ return super.save(senderGlZtcsEntity);
+ }
+
+ @Override
+ @DS("#senderGlZtcsEntity.dataSourceCode")
+ public SenderGlZtcsEntity updateGlZtcsHealthBureau(SenderGlZtcsEntity senderGlZtcsEntity) {
+ return super.update(senderGlZtcsEntity);
+ }
+
+ @Override
+ @DS("#senderGlZtcsEntity.dataSourceCode")
+ public Integer deleteGlZtcsHealthBureau(SenderGlZtcsEntity senderGlZtcsEntity) {
+ return super.delete("SenderGlZtcsEntity_delete_ztcs",senderGlZtcsEntity);
+ }
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/entity/SenderGlZtcsEntity.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/entity/SenderGlZtcsEntity.java
new file mode 100644
index 00000000..15ccfb35
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/entity/SenderGlZtcsEntity.java
@@ -0,0 +1,971 @@
+package com.hzya.frame.grpU8.nxproof.glZtcs.entity;
+
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/**
+ * (GlZtcs)实体类
+ *
+ * @author makejava
+ * @since 2024-06-20 09:45:03
+ */
+public class SenderGlZtcsEntity extends BaseEntity {
+
+ private String kjnd;//会计年度
+ private String ztbh;//账套编号
+ private String ztmc;//账套名称
+ private String ztmce;//账套全程
+ private String ztlb;//账套类别
+ private String hsdwdm;//核算单位代码
+ private String hsdwmc;//核算单位名称
+ private String bwbdm;//本位币代码
+ private String bwbmc;//本位币名称
+ private String yzkm;//预制科目模板
+ private Integer sjsj;//是否复制上级基础资料
+ private String bwbbf;//本位币币符
+ private String bwbdw;//本位币单位
+ private Integer bwbjd;//本位币金额小数位数
+ private String cwzg;//财务主管
+ private Integer kjqjs;//会计期间个数
+ private String qykjqj;//启用会计期间
+ private String wbhs;//是否外币核算
+ private String hllx;//汇率类型
+ private String sfyjz;//是否预记账
+ private String ztkz;//账套控制参数
+ private String yskz;
+ private String pzygkz;//凭证必输项
+ private String yspzkz;//原始凭证号严格核算
+ private Integer slxsws;//数量小数位数
+ private Integer djxsws;//单价小数位数
+ private String anyibz;//打印[安易软件]专用标志
+ private String kmbmfa;//科目编码方案
+ private String kmzbmfa;//科目组编码方案
+ private String bmbmfa;//部门编码方案
+ private String xmbmfa;//项目编码方案
+ private String dqbmfa;//地区编码方案
+ private String dwbmfa;//单位编码方案
+ private String xjbmfa;//现金编码方案
+ private String gsbmfa;//公司编码方案
+ private String bbpath;//用友安易报表路径
+ private String bkdtd;
+ private String bzdw;//报账单位
+ private String zbqyrq;
+ private String gkjzzf;
+ private String zbkzmb;
+ private String kzfs;
+ private String kzqj;
+ private String kzyj;
+ private String ybksy;
+ private String ybjsy;
+ private String zfpzbh;
+ private String bkdbh;
+ private String bkpzlx;
+ private String bkhskm;
+ private String bkyhkmyz;
+ private String zfscbkd;
+ private String bkdscpz;
+ private String szqxkz;
+ private String djxg;
+ private String djsh;
+ private String dybz;
+ private String jhsh;
+ private String zpscbk;
+ private String zphs;
+ private String dzkdm;
+ private String headbkdh;
+ private String bkdfs;
+ private String lrzy;
+ private Integer mjxsxsws;
+ private String wjsjlj;
+ private String sjkzbz;
+ private String needjfzb;
+ private String zdyfzyslbdm;
+ private String zdyfzyskzcs;
+ private String needyskm;
+ private String gkksbmfa;
+ private String pzbtdf;
+ private String ykjhyskm;
+ private String bkdxssjkm;
+ private String pzfjpath;
+ private String bkdxyfscz;
+ private String delmaxdh;
+ private String bkddataqxqy;
+ private String ykjhcs;
+ private String ykjhfs;
+ private String cnqzkm;
+ private String ztsx;
+ private String tsxkz;
+ private String zbkz;
+ private String wjz;
+ private String bkdxszhmc;
+ private Integer maxzdycount;
+ private String sjly;
+ private String flowcontrol;
+ private String cs1;
+ private String cs2;
+ private String cs3;
+ private String cs4;
+ private String cs5;
+ private String czyjkm;
+
+ private String kjyslbdm;
+ private String wbxsws;
+ private String hlxsws;
+ private String sfpxjz;
+ private String qyxbzw;
+ private String pxjzfs;
+ private String yzxjll;
+ private String nsrlx;
+ private String dzgd;
+ private String dzgdzttb;
+
+ public String getKjyslbdm() {
+ return kjyslbdm;
+ }
+
+ public void setKjyslbdm(String kjyslbdm) {
+ this.kjyslbdm = kjyslbdm;
+ }
+
+ public String getWbxsws() {
+ return wbxsws;
+ }
+
+ public void setWbxsws(String wbxsws) {
+ this.wbxsws = wbxsws;
+ }
+
+ public String getHlxsws() {
+ return hlxsws;
+ }
+
+ public void setHlxsws(String hlxsws) {
+ this.hlxsws = hlxsws;
+ }
+
+ public String getSfpxjz() {
+ return sfpxjz;
+ }
+
+ public void setSfpxjz(String sfpxjz) {
+ this.sfpxjz = sfpxjz;
+ }
+
+ public String getQyxbzw() {
+ return qyxbzw;
+ }
+
+ public void setQyxbzw(String qyxbzw) {
+ this.qyxbzw = qyxbzw;
+ }
+
+ public String getPxjzfs() {
+ return pxjzfs;
+ }
+
+ public void setPxjzfs(String pxjzfs) {
+ this.pxjzfs = pxjzfs;
+ }
+
+ public String getYzxjll() {
+ return yzxjll;
+ }
+
+ public void setYzxjll(String yzxjll) {
+ this.yzxjll = yzxjll;
+ }
+
+ public String getNsrlx() {
+ return nsrlx;
+ }
+
+ public void setNsrlx(String nsrlx) {
+ this.nsrlx = nsrlx;
+ }
+
+ public String getDzgd() {
+ return dzgd;
+ }
+
+ public void setDzgd(String dzgd) {
+ this.dzgd = dzgd;
+ }
+
+ public String getDzgdzttb() {
+ return dzgdzttb;
+ }
+
+ public void setDzgdzttb(String dzgdzttb) {
+ this.dzgdzttb = dzgdzttb;
+ }
+
+ public String getKjnd() {
+ return kjnd;
+ }
+
+ public void setKjnd(String kjnd) {
+ this.kjnd = kjnd;
+ }
+
+ public String getZtbh() {
+ return ztbh;
+ }
+
+ public void setZtbh(String ztbh) {
+ this.ztbh = ztbh;
+ }
+
+ public String getZtmc() {
+ return ztmc;
+ }
+
+ public void setZtmc(String ztmc) {
+ this.ztmc = ztmc;
+ }
+
+ public String getZtmce() {
+ return ztmce;
+ }
+
+ public void setZtmce(String ztmce) {
+ this.ztmce = ztmce;
+ }
+
+ public String getZtlb() {
+ return ztlb;
+ }
+
+ public void setZtlb(String ztlb) {
+ this.ztlb = ztlb;
+ }
+
+ public String getHsdwdm() {
+ return hsdwdm;
+ }
+
+ public void setHsdwdm(String hsdwdm) {
+ this.hsdwdm = hsdwdm;
+ }
+
+ public String getHsdwmc() {
+ return hsdwmc;
+ }
+
+ public void setHsdwmc(String hsdwmc) {
+ this.hsdwmc = hsdwmc;
+ }
+
+ public String getBwbdm() {
+ return bwbdm;
+ }
+
+ public void setBwbdm(String bwbdm) {
+ this.bwbdm = bwbdm;
+ }
+
+ public String getBwbmc() {
+ return bwbmc;
+ }
+
+ public void setBwbmc(String bwbmc) {
+ this.bwbmc = bwbmc;
+ }
+
+ public String getYzkm() {
+ return yzkm;
+ }
+
+ public void setYzkm(String yzkm) {
+ this.yzkm = yzkm;
+ }
+
+ public Integer getSjsj() {
+ return sjsj;
+ }
+
+ public void setSjsj(Integer sjsj) {
+ this.sjsj = sjsj;
+ }
+
+ public String getBwbbf() {
+ return bwbbf;
+ }
+
+ public void setBwbbf(String bwbbf) {
+ this.bwbbf = bwbbf;
+ }
+
+ public String getBwbdw() {
+ return bwbdw;
+ }
+
+ public void setBwbdw(String bwbdw) {
+ this.bwbdw = bwbdw;
+ }
+
+ public Integer getBwbjd() {
+ return bwbjd;
+ }
+
+ public void setBwbjd(Integer bwbjd) {
+ this.bwbjd = bwbjd;
+ }
+
+ public String getCwzg() {
+ return cwzg;
+ }
+
+ public void setCwzg(String cwzg) {
+ this.cwzg = cwzg;
+ }
+
+ public Integer getKjqjs() {
+ return kjqjs;
+ }
+
+ public void setKjqjs(Integer kjqjs) {
+ this.kjqjs = kjqjs;
+ }
+
+ public String getQykjqj() {
+ return qykjqj;
+ }
+
+ public void setQykjqj(String qykjqj) {
+ this.qykjqj = qykjqj;
+ }
+
+ public String getWbhs() {
+ return wbhs;
+ }
+
+ public void setWbhs(String wbhs) {
+ this.wbhs = wbhs;
+ }
+
+ public String getHllx() {
+ return hllx;
+ }
+
+ public void setHllx(String hllx) {
+ this.hllx = hllx;
+ }
+
+ public String getSfyjz() {
+ return sfyjz;
+ }
+
+ public void setSfyjz(String sfyjz) {
+ this.sfyjz = sfyjz;
+ }
+
+ public String getZtkz() {
+ return ztkz;
+ }
+
+ public void setZtkz(String ztkz) {
+ this.ztkz = ztkz;
+ }
+
+ public String getYskz() {
+ return yskz;
+ }
+
+ public void setYskz(String yskz) {
+ this.yskz = yskz;
+ }
+
+ public String getPzygkz() {
+ return pzygkz;
+ }
+
+ public void setPzygkz(String pzygkz) {
+ this.pzygkz = pzygkz;
+ }
+
+ public String getYspzkz() {
+ return yspzkz;
+ }
+
+ public void setYspzkz(String yspzkz) {
+ this.yspzkz = yspzkz;
+ }
+
+ public Integer getSlxsws() {
+ return slxsws;
+ }
+
+ public void setSlxsws(Integer slxsws) {
+ this.slxsws = slxsws;
+ }
+
+ public Integer getDjxsws() {
+ return djxsws;
+ }
+
+ public void setDjxsws(Integer djxsws) {
+ this.djxsws = djxsws;
+ }
+
+ public String getAnyibz() {
+ return anyibz;
+ }
+
+ public void setAnyibz(String anyibz) {
+ this.anyibz = anyibz;
+ }
+
+ public String getKmbmfa() {
+ return kmbmfa;
+ }
+
+ public void setKmbmfa(String kmbmfa) {
+ this.kmbmfa = kmbmfa;
+ }
+
+ public String getKmzbmfa() {
+ return kmzbmfa;
+ }
+
+ public void setKmzbmfa(String kmzbmfa) {
+ this.kmzbmfa = kmzbmfa;
+ }
+
+ public String getBmbmfa() {
+ return bmbmfa;
+ }
+
+ public void setBmbmfa(String bmbmfa) {
+ this.bmbmfa = bmbmfa;
+ }
+
+ public String getXmbmfa() {
+ return xmbmfa;
+ }
+
+ public void setXmbmfa(String xmbmfa) {
+ this.xmbmfa = xmbmfa;
+ }
+
+ public String getDqbmfa() {
+ return dqbmfa;
+ }
+
+ public void setDqbmfa(String dqbmfa) {
+ this.dqbmfa = dqbmfa;
+ }
+
+ public String getDwbmfa() {
+ return dwbmfa;
+ }
+
+ public void setDwbmfa(String dwbmfa) {
+ this.dwbmfa = dwbmfa;
+ }
+
+ public String getXjbmfa() {
+ return xjbmfa;
+ }
+
+ public void setXjbmfa(String xjbmfa) {
+ this.xjbmfa = xjbmfa;
+ }
+
+ public String getGsbmfa() {
+ return gsbmfa;
+ }
+
+ public void setGsbmfa(String gsbmfa) {
+ this.gsbmfa = gsbmfa;
+ }
+
+ public String getBbpath() {
+ return bbpath;
+ }
+
+ public void setBbpath(String bbpath) {
+ this.bbpath = bbpath;
+ }
+
+ public String getBkdtd() {
+ return bkdtd;
+ }
+
+ public void setBkdtd(String bkdtd) {
+ this.bkdtd = bkdtd;
+ }
+
+ public String getBzdw() {
+ return bzdw;
+ }
+
+ public void setBzdw(String bzdw) {
+ this.bzdw = bzdw;
+ }
+
+ public String getZbqyrq() {
+ return zbqyrq;
+ }
+
+ public void setZbqyrq(String zbqyrq) {
+ this.zbqyrq = zbqyrq;
+ }
+
+ public String getGkjzzf() {
+ return gkjzzf;
+ }
+
+ public void setGkjzzf(String gkjzzf) {
+ this.gkjzzf = gkjzzf;
+ }
+
+ public String getZbkzmb() {
+ return zbkzmb;
+ }
+
+ public void setZbkzmb(String zbkzmb) {
+ this.zbkzmb = zbkzmb;
+ }
+
+ public String getKzfs() {
+ return kzfs;
+ }
+
+ public void setKzfs(String kzfs) {
+ this.kzfs = kzfs;
+ }
+
+ public String getKzqj() {
+ return kzqj;
+ }
+
+ public void setKzqj(String kzqj) {
+ this.kzqj = kzqj;
+ }
+
+ public String getKzyj() {
+ return kzyj;
+ }
+
+ public void setKzyj(String kzyj) {
+ this.kzyj = kzyj;
+ }
+
+ public String getYbksy() {
+ return ybksy;
+ }
+
+ public void setYbksy(String ybksy) {
+ this.ybksy = ybksy;
+ }
+
+ public String getYbjsy() {
+ return ybjsy;
+ }
+
+ public void setYbjsy(String ybjsy) {
+ this.ybjsy = ybjsy;
+ }
+
+ public String getZfpzbh() {
+ return zfpzbh;
+ }
+
+ public void setZfpzbh(String zfpzbh) {
+ this.zfpzbh = zfpzbh;
+ }
+
+ public String getBkdbh() {
+ return bkdbh;
+ }
+
+ public void setBkdbh(String bkdbh) {
+ this.bkdbh = bkdbh;
+ }
+
+ public String getBkpzlx() {
+ return bkpzlx;
+ }
+
+ public void setBkpzlx(String bkpzlx) {
+ this.bkpzlx = bkpzlx;
+ }
+
+ public String getBkhskm() {
+ return bkhskm;
+ }
+
+ public void setBkhskm(String bkhskm) {
+ this.bkhskm = bkhskm;
+ }
+
+ public String getBkyhkmyz() {
+ return bkyhkmyz;
+ }
+
+ public void setBkyhkmyz(String bkyhkmyz) {
+ this.bkyhkmyz = bkyhkmyz;
+ }
+
+ public String getZfscbkd() {
+ return zfscbkd;
+ }
+
+ public void setZfscbkd(String zfscbkd) {
+ this.zfscbkd = zfscbkd;
+ }
+
+ public String getBkdscpz() {
+ return bkdscpz;
+ }
+
+ public void setBkdscpz(String bkdscpz) {
+ this.bkdscpz = bkdscpz;
+ }
+
+ public String getSzqxkz() {
+ return szqxkz;
+ }
+
+ public void setSzqxkz(String szqxkz) {
+ this.szqxkz = szqxkz;
+ }
+
+ public String getDjxg() {
+ return djxg;
+ }
+
+ public void setDjxg(String djxg) {
+ this.djxg = djxg;
+ }
+
+ public String getDjsh() {
+ return djsh;
+ }
+
+ public void setDjsh(String djsh) {
+ this.djsh = djsh;
+ }
+
+ public String getDybz() {
+ return dybz;
+ }
+
+ public void setDybz(String dybz) {
+ this.dybz = dybz;
+ }
+
+ public String getJhsh() {
+ return jhsh;
+ }
+
+ public void setJhsh(String jhsh) {
+ this.jhsh = jhsh;
+ }
+
+ public String getZpscbk() {
+ return zpscbk;
+ }
+
+ public void setZpscbk(String zpscbk) {
+ this.zpscbk = zpscbk;
+ }
+
+ public String getZphs() {
+ return zphs;
+ }
+
+ public void setZphs(String zphs) {
+ this.zphs = zphs;
+ }
+
+ public String getDzkdm() {
+ return dzkdm;
+ }
+
+ public void setDzkdm(String dzkdm) {
+ this.dzkdm = dzkdm;
+ }
+
+ public String getHeadbkdh() {
+ return headbkdh;
+ }
+
+ public void setHeadbkdh(String headbkdh) {
+ this.headbkdh = headbkdh;
+ }
+
+ public String getBkdfs() {
+ return bkdfs;
+ }
+
+ public void setBkdfs(String bkdfs) {
+ this.bkdfs = bkdfs;
+ }
+
+ public String getLrzy() {
+ return lrzy;
+ }
+
+ public void setLrzy(String lrzy) {
+ this.lrzy = lrzy;
+ }
+
+ public Integer getMjxsxsws() {
+ return mjxsxsws;
+ }
+
+ public void setMjxsxsws(Integer mjxsxsws) {
+ this.mjxsxsws = mjxsxsws;
+ }
+
+ public String getWjsjlj() {
+ return wjsjlj;
+ }
+
+ public void setWjsjlj(String wjsjlj) {
+ this.wjsjlj = wjsjlj;
+ }
+
+ public String getSjkzbz() {
+ return sjkzbz;
+ }
+
+ public void setSjkzbz(String sjkzbz) {
+ this.sjkzbz = sjkzbz;
+ }
+
+ public String getNeedjfzb() {
+ return needjfzb;
+ }
+
+ public void setNeedjfzb(String needjfzb) {
+ this.needjfzb = needjfzb;
+ }
+
+ public String getZdyfzyslbdm() {
+ return zdyfzyslbdm;
+ }
+
+ public void setZdyfzyslbdm(String zdyfzyslbdm) {
+ this.zdyfzyslbdm = zdyfzyslbdm;
+ }
+
+ public String getZdyfzyskzcs() {
+ return zdyfzyskzcs;
+ }
+
+ public void setZdyfzyskzcs(String zdyfzyskzcs) {
+ this.zdyfzyskzcs = zdyfzyskzcs;
+ }
+
+ public String getNeedyskm() {
+ return needyskm;
+ }
+
+ public void setNeedyskm(String needyskm) {
+ this.needyskm = needyskm;
+ }
+
+ public String getGkksbmfa() {
+ return gkksbmfa;
+ }
+
+ public void setGkksbmfa(String gkksbmfa) {
+ this.gkksbmfa = gkksbmfa;
+ }
+
+ public String getPzbtdf() {
+ return pzbtdf;
+ }
+
+ public void setPzbtdf(String pzbtdf) {
+ this.pzbtdf = pzbtdf;
+ }
+
+ public String getYkjhyskm() {
+ return ykjhyskm;
+ }
+
+ public void setYkjhyskm(String ykjhyskm) {
+ this.ykjhyskm = ykjhyskm;
+ }
+
+ public String getBkdxssjkm() {
+ return bkdxssjkm;
+ }
+
+ public void setBkdxssjkm(String bkdxssjkm) {
+ this.bkdxssjkm = bkdxssjkm;
+ }
+
+ public String getPzfjpath() {
+ return pzfjpath;
+ }
+
+ public void setPzfjpath(String pzfjpath) {
+ this.pzfjpath = pzfjpath;
+ }
+
+ public String getBkdxyfscz() {
+ return bkdxyfscz;
+ }
+
+ public void setBkdxyfscz(String bkdxyfscz) {
+ this.bkdxyfscz = bkdxyfscz;
+ }
+
+ public String getDelmaxdh() {
+ return delmaxdh;
+ }
+
+ public void setDelmaxdh(String delmaxdh) {
+ this.delmaxdh = delmaxdh;
+ }
+
+ public String getBkddataqxqy() {
+ return bkddataqxqy;
+ }
+
+ public void setBkddataqxqy(String bkddataqxqy) {
+ this.bkddataqxqy = bkddataqxqy;
+ }
+
+ public String getYkjhcs() {
+ return ykjhcs;
+ }
+
+ public void setYkjhcs(String ykjhcs) {
+ this.ykjhcs = ykjhcs;
+ }
+
+ public String getYkjhfs() {
+ return ykjhfs;
+ }
+
+ public void setYkjhfs(String ykjhfs) {
+ this.ykjhfs = ykjhfs;
+ }
+
+ public String getCnqzkm() {
+ return cnqzkm;
+ }
+
+ public void setCnqzkm(String cnqzkm) {
+ this.cnqzkm = cnqzkm;
+ }
+
+ public String getZtsx() {
+ return ztsx;
+ }
+
+ public void setZtsx(String ztsx) {
+ this.ztsx = ztsx;
+ }
+
+ public String getTsxkz() {
+ return tsxkz;
+ }
+
+ public void setTsxkz(String tsxkz) {
+ this.tsxkz = tsxkz;
+ }
+
+ public String getZbkz() {
+ return zbkz;
+ }
+
+ public void setZbkz(String zbkz) {
+ this.zbkz = zbkz;
+ }
+
+ public String getWjz() {
+ return wjz;
+ }
+
+ public void setWjz(String wjz) {
+ this.wjz = wjz;
+ }
+
+ public String getBkdxszhmc() {
+ return bkdxszhmc;
+ }
+
+ public void setBkdxszhmc(String bkdxszhmc) {
+ this.bkdxszhmc = bkdxszhmc;
+ }
+
+ public Integer getMaxzdycount() {
+ return maxzdycount;
+ }
+
+ public void setMaxzdycount(Integer maxzdycount) {
+ this.maxzdycount = maxzdycount;
+ }
+
+ public String getSjly() {
+ return sjly;
+ }
+
+ public void setSjly(String sjly) {
+ this.sjly = sjly;
+ }
+
+ public String getFlowcontrol() {
+ return flowcontrol;
+ }
+
+ public void setFlowcontrol(String flowcontrol) {
+ this.flowcontrol = flowcontrol;
+ }
+
+ public String getCs1() {
+ return cs1;
+ }
+
+ public void setCs1(String cs1) {
+ this.cs1 = cs1;
+ }
+
+ public String getCs2() {
+ return cs2;
+ }
+
+ public void setCs2(String cs2) {
+ this.cs2 = cs2;
+ }
+
+ public String getCs3() {
+ return cs3;
+ }
+
+ public void setCs3(String cs3) {
+ this.cs3 = cs3;
+ }
+
+ public String getCs4() {
+ return cs4;
+ }
+
+ public void setCs4(String cs4) {
+ this.cs4 = cs4;
+ }
+
+ public String getCs5() {
+ return cs5;
+ }
+
+ public void setCs5(String cs5) {
+ this.cs5 = cs5;
+ }
+
+ public String getCzyjkm() {
+ return czyjkm;
+ }
+
+ public void setCzyjkm(String czyjkm) {
+ this.czyjkm = czyjkm;
+ }
+
+}
+
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/entity/SenderGlZtcsEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/entity/SenderGlZtcsEntity.xml
new file mode 100644
index 00000000..56a899e8
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glZtcs/entity/SenderGlZtcsEntity.xml
@@ -0,0 +1,1222 @@
+
+
+
+
+
+