Merge branches 'dev' and 'grpU8' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8

This commit is contained in:
lvleigang 2024-09-04 16:17:05 +08:00
commit 95a705c739
57 changed files with 4072 additions and 111 deletions

View File

@ -23,25 +23,24 @@ spring:
dynamic:
druid:
filters: stat,log4j2
validationQuery: SELECT 1 # 验证数据库服务可用性的sql.用来检测连接是否有效的sql 因数据库方言而差, 例如 oracle 应该写成 SELECT 1 FROM DUAL
datasource:
master:
# url: jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
# username: hzyazt
# url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
# username: root
# password: 62e4295b615a30dbf3b8ee96f41c820b
# driver-class-name: dm.jdbc.driver.DmDriver
# type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
username: root
# driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
url: jdbc:sqlserver://192.168.2.247:9433;DatabaseName=businesscenter;encrypt=false;trustServerCertificate=true
username: sa
password: 62e4295b615a30dbf3b8ee96f41c820b
driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
# url: jdbc:dm://hzya.ufyct.com:9040/businesscenter?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
# url: jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
# username: hzyazt
# password: 62e4295b615a30dbf3b8ee96f41c820b
# driver-class-name: dm.jdbc.driver.DmDriver
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
savefile:
# 文件保存路径
path: /Users/apple/Desktop/log/local
pluginpath:
tomcatpath:
zt:
url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
cbs8:

View File

@ -29,4 +29,19 @@ public interface IAcctVouchInfoService extends IBaseService<AcctVouchInfoEntity,
* @Date 11:52 上午 2024/3/27
**/
SysExtensionApiEntity addDataSourceCode(SysExtensionApiEntity jsonObject);
/**
* @Author lvleigang
* @Description 查询凭证目录
* @Date 1:48 下午 2024/8/27
* @param object
* @return java.lang.Object
**/
Object queryPzml(JSONObject object);
Object queryPznr(JSONObject object);
Object queryPz(JSONObject object);
Object queryPzPage(JSONObject object);
}

View File

@ -3,6 +3,14 @@ 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.grpU8.nxproof.glPzml.dao.ISenderGlPzmlDao;
import com.hzya.frame.grpU8.nxproof.glPzml.entity.SenderGlPzmlEntity;
import com.hzya.frame.grpU8.nxproof.glPznr.dao.ISenderGlPznrDao;
import com.hzya.frame.grpU8.nxproof.glPznr.entity.SenderGlPznrEntity;
import com.hzya.frame.grpU8.nxproof.glfzxzl.dao.IGlFzxzlDao;
import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntityDto;
import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlNrDmEntityDto;
import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlNrEntityDto;
import com.hzya.frame.sysnew.application.database.dao.ISysApplicationDatabaseDao;
import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
import com.hzya.frame.sysnew.application.entity.SysApplicationEntity;
@ -16,11 +24,13 @@ 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.apache.commons.lang3.StringUtils;
import org.bson.json.JsonObject;
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.ArrayList;
import java.util.List;
import java.util.Map;
@ -37,7 +47,12 @@ public class AcctVouchInfoServiceImpl extends BaseService<AcctVouchInfoEntity, S
@Resource
private ISysApplicationDatabaseDao sysApplicationDatabaseDao;
@Resource
private ISenderGlPzmlDao senderGlPzmlDao;
@Resource
private ISenderGlPznrDao senderGlPznrDao;
@Resource
private IGlFzxzlDao glFzxzlDao;
@Autowired
public void setAcctVouchInfoDao(IAcctVouchInfoDao dao) {
this.acctVouchInfoDao = dao;
@ -71,7 +86,8 @@ public class AcctVouchInfoServiceImpl extends BaseService<AcctVouchInfoEntity, S
JSONObject object = new JSONObject();
object.put("status","success");
object.put("data",list);
return object; }
return object;
}
}
/**
@ -102,4 +118,312 @@ public class AcctVouchInfoServiceImpl extends BaseService<AcctVouchInfoEntity, S
}
return entity;
}
/**
* @param object
* @return java.lang.Object
* @Author lvleigang
* @Description 查询凭证目录
* @Date 1:48 下午 2024/8/27
**/
@Override
public Object queryPzml(JSONObject object) {
SenderGlPzmlEntity entity = getData("jsonStr", object,SenderGlPzmlEntity.class);
//判断分页
if (entity.getPageNum() != null && entity.getPageSize() != null) {
PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
List<SenderGlPzmlEntity> list = senderGlPzmlDao.querySenderGlPzmlEntity(entity);
PageInfo pageInfo = new PageInfo(list);
JSONObject returnObject = new JSONObject();
returnObject.put("status","success");
returnObject.put("data",pageInfo);
returnObject.put("msg","查询成功");
return returnObject;
}else {
List<SenderGlPzmlEntity> list = senderGlPzmlDao.querySenderGlPzmlEntity(entity);
JSONObject returnObject = new JSONObject();
returnObject.put("status","success");
returnObject.put("data",list);
returnObject.put("msg","查询成功");
return returnObject;
}
}
/**
* @param object
* @return java.lang.Object
* @Author lvleigang
* @Description 查询凭证内容
* @Date 1:48 下午 2024/8/27
**/
@Override
public Object queryPznr(JSONObject object) {
SenderGlPznrEntity entity = getData("jsonStr", object,SenderGlPznrEntity.class);
//判断分页
if (entity.getPageNum() != null && entity.getPageSize() != null) {
PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
List<SenderGlPznrEntity> list = senderGlPznrDao.querySenderGlPznrEntity(entity);
PageInfo pageInfo = new PageInfo(list);
JSONObject returnObject = new JSONObject();
returnObject.put("status","success");
returnObject.put("data",pageInfo);
returnObject.put("msg","查询成功");
return returnObject;
}else {
List<SenderGlPznrEntity> list = senderGlPznrDao.querySenderGlPznrEntity(entity);
JSONObject returnObject = new JSONObject();
returnObject.put("status","success");
returnObject.put("data",list);
returnObject.put("msg","查询成功");
return returnObject;
}
}
/**
* @param object
* @return java.lang.Object
* @Author lvleigang
* @Description 查询凭证 目录 内容 辅助核算
* @Date 1:48 下午 2024/8/27
**/
@Override
public Object queryPz(JSONObject object) {
SenderGlPzmlEntity entity = getData("jsonStr", object,SenderGlPzmlEntity.class);
//判断分页
if (entity.getIdpzh() != null && !"".equals(entity.getIdpzh())) {
//查询凭证目录
SenderGlPzmlEntity senderGlPzmlEntity = senderGlPzmlDao.queryPzmlByIdpzh(entity);
if(senderGlPzmlEntity.getIdpzh() != null && !"".equals(senderGlPzmlEntity.getIdpzh())){
//查询凭证内容
SenderGlPznrEntity senderGlPznrEntity = new SenderGlPznrEntity();
senderGlPznrEntity.setDataSourceCode(entity.getDataSourceCode());
senderGlPznrEntity.setIdpzh(entity.getIdpzh());
List<SenderGlPznrEntity> list = senderGlPznrDao.querySenderGlPznrEntityByIdpzh(senderGlPznrEntity);
senderGlPzmlEntity.setSenderGlPznrEntities(list);
//查询辅助核算
if(list != null && list.size() > 0){
GlFzxzlEntityDto glFzxzlEntityDto = new GlFzxzlEntityDto();
glFzxzlEntityDto.setDataSourceCode(entity.getDataSourceCode());
glFzxzlEntityDto.setSfyz("0");
List<GlFzxzlNrEntityDto> glFzxzlNrEntityDtos = new ArrayList<>();
for (int i = 0; i < list.size(); i++) {
if(list.get(i).getKjqj() != null && list.get(i).getKjqj().length() >= 4){
GlFzxzlNrEntityDto glFzxzlNrEntityDto = new GlFzxzlNrEntityDto();
glFzxzlNrEntityDto.setGsdm(list.get(i).getGsdm());
glFzxzlNrEntityDto.setKjnd(list.get(i).getKjqj().substring(0,4));
List<GlFzxzlNrDmEntityDto> glFzxzlNrDmEntityDtos = new ArrayList<>();
if(list.get(i).getFzhs() != null && !"".equals(list.get(i).getFzhs())){
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(list.get(i));
String[] fzhs = list.get(i).getFzhs().split(",");
if(fzhs != null && fzhs.length > 0){
for (int i1 = 0; i1 < fzhs.length; i1++) {
if(fzhs[i1] != null && !"".equals(fzhs[i1])){
if(jsonObject.get("fzdm"+fzhs[i1]) != null && !"".equals(jsonObject.get("fzdm"+fzhs[i1]))){
GlFzxzlNrDmEntityDto glFzxzlNrDmEntityDto = new GlFzxzlNrDmEntityDto();
glFzxzlNrDmEntityDto.setLbdm(fzhs[i1]);
glFzxzlNrDmEntityDto.setFzdm(jsonObject.getString("fzdm"+fzhs[i1]));
glFzxzlNrDmEntityDtos.add(glFzxzlNrDmEntityDto);
}
}
}
}
}
if(glFzxzlNrDmEntityDtos.size() > 0){
glFzxzlNrEntityDto.setGlFzxzlNrDmEntityDtos(glFzxzlNrDmEntityDtos);
glFzxzlNrEntityDtos.add(glFzxzlNrEntityDto);
}
}
}
if(glFzxzlNrEntityDtos.size() > 0) {
glFzxzlEntityDto.setGlFzxzlNrEntityDtos(glFzxzlNrEntityDtos);
// 查询数据设置值
List<JSONObject> fzhss = glFzxzlDao.queryFzhs(glFzxzlEntityDto);
if(fzhss != null && fzhss.size() > 0){
for (int i = 0; i < list.size(); i++) {
List<JSONObject> fzhslist = new ArrayList<>();
list.get(i).setFzhslist(fzhslist);
if (list.get(i).getKjqj() != null && list.get(i).getKjqj().length() >= 4) {
if (list.get(i).getFzhs() != null && !"".equals(list.get(i).getFzhs())) {
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(list.get(i));
String[] fzhs = list.get(i).getFzhs().split(",");
if (fzhs != null && fzhs.length > 0) {
for (int i1 = 0; i1 < fzhs.length; i1++) {
if (fzhs[i1] != null && !"".equals(fzhs[i1])) {
if (jsonObject.get("fzdm" + fzhs[i1]) != null && !"".equals(jsonObject.get("fzdm" + fzhs[i1]))) {
for (int i2 = 0; i2 < fzhss.size(); i2++) {
if(fzhss.get(i2).getString("lbdm").equals(fzhs[i1])
&& fzhss.get(i2).getString("gsdm").equals(list.get(i).getGsdm())
&& fzhss.get(i2).getString("kjnd").equals(list.get(i).getKjqj().substring(0,4))
&& fzhss.get(i2).getString("fzdm").equals(jsonObject.get("fzdm" + fzhs[i1]))
){
JSONObject a = new JSONObject();
a.put("lbdm",fzhss.get(i2).getString("lbdm"));
a.put("fzdm",fzhss.get(i2).getString("fzdm"));
a.put("fzmc",fzhss.get(i2).getString("fzmc"));
fzhslist.add(a);
}
}
}
}
}
}
}
}
}
}
}
}
}else {
JSONObject returnObject = new JSONObject();
returnObject.put("status","false");
returnObject.put("msg","查询错误根据idpzh未查询到凭证");
return returnObject;
}
JSONObject returnObject = new JSONObject();
returnObject.put("status","success");
returnObject.put("data",senderGlPzmlEntity);
returnObject.put("msg","查询成功");
return returnObject;
}else {
JSONObject returnObject = new JSONObject();
returnObject.put("status","false");
returnObject.put("msg","查询错误idpzh为空");
return returnObject;
}
}
@Override
public Object queryPzPage(JSONObject object) {
SenderGlPzmlEntity entity = getData("jsonStr", object,SenderGlPzmlEntity.class);
//判断分页
if (entity.getPageNum() != null && entity.getPageSize() != null) {
PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
List<SenderGlPzmlEntity> list = senderGlPzmlDao.querySenderGlPzmlEntity(entity);
PageInfo pageInfo = new PageInfo(list);
doPznrAndPzmlFzhs(list,entity.getDataSourceCode());
JSONObject returnObject = new JSONObject();
returnObject.put("status","success");
returnObject.put("data",pageInfo);
returnObject.put("msg","查询成功");
return returnObject;
}else {
JSONObject returnObject = new JSONObject();
returnObject.put("status","false");
returnObject.put("msg","请先传递分页参数");
return returnObject;
}
}
/**
* @Author lvleigang
* @Description 处理凭证内容和辅助核算
* @Date 2:15 下午 2024/8/29
* @param senderGlPzmlEntities
* @param dataSourceCode
* @return void
**/
private void doPznrAndPzmlFzhs(List<SenderGlPzmlEntity> senderGlPzmlEntities, String dataSourceCode) {
if(senderGlPzmlEntities == null || senderGlPzmlEntities.size() == 0 ){
return;
}
//查询凭证内容
List<String> idpzhs = new ArrayList<>();
for (int i = 0; i < senderGlPzmlEntities.size(); i++) {
idpzhs.add(senderGlPzmlEntities.get(i).getIdpzh());
}
SenderGlPznrEntity senderGlPznrEntity = new SenderGlPznrEntity();
senderGlPznrEntity.setDataSourceCode(dataSourceCode);
senderGlPznrEntity.setIdpzhs(idpzhs);
List<SenderGlPznrEntity> list = senderGlPznrDao.querySenderGlPznrEntityByIdpzh(senderGlPznrEntity);
if(list == null || list.size() == 0 ){
return;
}
GlFzxzlEntityDto glFzxzlEntityDto = new GlFzxzlEntityDto();
glFzxzlEntityDto.setDataSourceCode(dataSourceCode);
glFzxzlEntityDto.setSfyz("0");
List<GlFzxzlNrEntityDto> glFzxzlNrEntityDtos = new ArrayList<>();
for (int i = 0; i < list.size(); i++) {
if(list.get(i).getKjqj() != null && list.get(i).getKjqj().length() >= 4){
GlFzxzlNrEntityDto glFzxzlNrEntityDto = new GlFzxzlNrEntityDto();
glFzxzlNrEntityDto.setGsdm(list.get(i).getGsdm());
glFzxzlNrEntityDto.setKjnd(list.get(i).getKjqj().substring(0,4));
List<GlFzxzlNrDmEntityDto> glFzxzlNrDmEntityDtos = new ArrayList<>();
if(list.get(i).getFzhs() != null && !"".equals(list.get(i).getFzhs())){
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(list.get(i));
String[] fzhs = list.get(i).getFzhs().split(",");
if(fzhs != null && fzhs.length > 0){
for (int i1 = 0; i1 < fzhs.length; i1++) {
if(fzhs[i1] != null && !"".equals(fzhs[i1])){
if(jsonObject.get("fzdm"+fzhs[i1]) != null && !"".equals(jsonObject.get("fzdm"+fzhs[i1]))){
GlFzxzlNrDmEntityDto glFzxzlNrDmEntityDto = new GlFzxzlNrDmEntityDto();
glFzxzlNrDmEntityDto.setLbdm(fzhs[i1]);
glFzxzlNrDmEntityDto.setFzdm(jsonObject.getString("fzdm"+fzhs[i1]));
glFzxzlNrDmEntityDtos.add(glFzxzlNrDmEntityDto);
}
}
}
}
}
if(glFzxzlNrDmEntityDtos.size() > 0){
glFzxzlNrEntityDto.setGlFzxzlNrDmEntityDtos(glFzxzlNrDmEntityDtos);
glFzxzlNrEntityDtos.add(glFzxzlNrEntityDto);
}
}
}
if(glFzxzlNrEntityDtos.size() > 0) {
glFzxzlEntityDto.setGlFzxzlNrEntityDtos(glFzxzlNrEntityDtos);
// 查询数据设置值
List<JSONObject> fzhss = glFzxzlDao.queryFzhs(glFzxzlEntityDto);
if(fzhss != null && fzhss.size() > 0){
for (int i = 0; i < list.size(); i++) {
List<JSONObject> fzhslist = new ArrayList<>();
list.get(i).setFzhslist(fzhslist);
if (list.get(i).getKjqj() != null && list.get(i).getKjqj().length() >= 4) {
if (list.get(i).getFzhs() != null && !"".equals(list.get(i).getFzhs())) {
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(list.get(i));
String[] fzhs = list.get(i).getFzhs().split(",");
if (fzhs != null && fzhs.length > 0) {
for (int i1 = 0; i1 < fzhs.length; i1++) {
if (fzhs[i1] != null && !"".equals(fzhs[i1])) {
if (jsonObject.get("fzdm" + fzhs[i1]) != null && !"".equals(jsonObject.get("fzdm" + fzhs[i1]))) {
for (int i2 = 0; i2 < fzhss.size(); i2++) {
if(fzhss.get(i2).getString("lbdm").equals(fzhs[i1])
&& fzhss.get(i2).getString("gsdm").equals(list.get(i).getGsdm())
&& fzhss.get(i2).getString("kjnd").equals(list.get(i).getKjqj().substring(0,4))
&& fzhss.get(i2).getString("fzdm").equals(jsonObject.get("fzdm" + fzhs[i1]))
){
JSONObject a = new JSONObject();
a.put("lbdm",fzhss.get(i2).getString("lbdm"));
a.put("fzdm",fzhss.get(i2).getString("fzdm"));
a.put("fzmc",fzhss.get(i2).getString("fzmc"));
fzhslist.add(a);
}
}
}
}
}
}
}
}
}
}
}
for (int i = 0; i < senderGlPzmlEntities.size(); i++) {
List<SenderGlPznrEntity> senderGlPznrEntities = new ArrayList<>();
for (int i1 = 0; i1 < list.size(); i1++) {
if(senderGlPzmlEntities.get(i).getIdpzh().equals(list.get(i1).getIdpzh())){
senderGlPznrEntities.add(list.get(i1));
}
}
senderGlPzmlEntities.get(i).setSenderGlPznrEntities(senderGlPznrEntities);
}
}
}

View File

@ -38,4 +38,44 @@ public interface IGbiZbxmbDao extends IBaseDao<GbiZbxmbEntity, String> {
* @Date 2024/8/14 17:15
* **/
List<GbiZbxmbEntity> queryZbxmbByIdpzh(GbiZbxmbEntity gbiZbxmbEntity);
/**
*
* @content 查询项目指标数据
* @Param
* @Return
* @Author hecan
* @Date 2024/8/28 15:52
* **/
List<GbiZbxmbEntity> queryGbiZbxmbEntity(GbiZbxmbEntity gbiZbxmbEntity);
/**
*
* @content 保存项目指标数据
* @Param
* @Return
* @Author hecan
* @Date 2024/8/28 17:04
* **/
GbiZbxmbEntity saveGbiZbxmbEntity(GbiZbxmbEntity gbiZbxmbEntity);
/**
*
* @content 更新项目指标数据
* @Param
* @Return
* @Author hecan
* @Date 2024/8/28 17:05
* **/
GbiZbxmbEntity updateGbiZbxmbEntity(GbiZbxmbEntity gbiZbxmbEntity);
/**
*
* @content 删除项目指标数据
* @Param
* @Return
* @Author hecan
* @Date 2024/8/28 17:09
* **/
Integer deleteGbiZbxmbEntity(GbiZbxmbEntity gbiZbxmbEntity);
}

View File

@ -36,5 +36,29 @@ public class GbiZbxmbDaoImpl extends MybatisGenericDao<GbiZbxmbEntity, String> i
return (List<GbiZbxmbEntity>)super.selectList("queryZbxmbByIdpzh",gbiZbxmbEntity);
}
@Override
@DS("#gbiZbxmbEntity.dataSourceCode")
public List<GbiZbxmbEntity> queryGbiZbxmbEntity(GbiZbxmbEntity gbiZbxmbEntity) {
return super.query(gbiZbxmbEntity);
}
@Override
@DS("#gbiZbxmbEntity.dataSourceCode")
public GbiZbxmbEntity saveGbiZbxmbEntity(GbiZbxmbEntity gbiZbxmbEntity) {
return super.save(gbiZbxmbEntity);
}
@Override
@DS("#gbiZbxmbEntity.dataSourceCode")
public GbiZbxmbEntity updateGbiZbxmbEntity(GbiZbxmbEntity gbiZbxmbEntity) {
return super.update(gbiZbxmbEntity);
}
@Override
@DS("#gbiZbxmbEntity.dataSourceCode")
public Integer deleteGbiZbxmbEntity(GbiZbxmbEntity gbiZbxmbEntity) {
return super.delete("GbiZbxmbEntity_delete_zbxmb",gbiZbxmbEntity);
}
}

View File

@ -1,5 +1,6 @@
package com.hzya.frame.grpU8.nxproof.gbizbxmb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.hzya.frame.web.entity.BaseEntity;
/**
* (GbiZbxmb)实体类
@ -110,7 +111,8 @@ public class GbiZbxmbEntity extends BaseEntity {
private String lrrq;
private String lrsj;
private Integer shrid;
private String shr;
private String auditor;
private String shrq;
private String shsj;
private Integer pfrid;
@ -966,12 +968,12 @@ public class GbiZbxmbEntity extends BaseEntity {
this.shrid = shrid;
}
public String getShr() {
return shr;
public String getAuditor() {
return auditor;
}
public void setShr(String shr) {
this.shr = shr;
public void setAuditor(String auditor) {
this.auditor = auditor;
}
public String getShrq() {

View File

@ -179,7 +179,7 @@
,XMDM
,XMMC
,GNKMDM
,GNKMMC
,GNKMMC
,JJKMDM
,JJKMMC
,FZ6DM
@ -246,7 +246,7 @@
,LRRQ
,LRSJ
,SHRID
,SHR
,SHR as auditor
,SHRQ
,SHSJ
,PFRID
@ -392,7 +392,6 @@
<if test="lrrq != null and lrrq != ''"> and LRRQ = #{lrrq} </if>
<if test="lrsj != null and lrsj != ''"> and LRSJ = #{lrsj} </if>
<if test="shrid != null"> and SHRID = #{shrid} </if>
<if test="shr != null and shr != ''"> and SHR = #{shr} </if>
<if test="shrq != null and shrq != ''"> and SHRQ = #{shrq} </if>
<if test="shsj != null and shsj != ''"> and SHSJ = #{shsj} </if>
<if test="pfrid != null"> and PFRID = #{pfrid} </if>
@ -901,7 +900,7 @@
</select>
<!--新增所有列-->
<insert id="entity_insert" parameterType = "com.hzya.frame.grpU8.nxproof.gbizbxmb.entity.GbiZbxmbEntity" keyProperty="zbid" useGeneratedKeys="true">
<insert id="entity_insert" parameterType = "com.hzya.frame.grpU8.nxproof.gbizbxmb.entity.GbiZbxmbEntity" >
insert into gbi_zbxmb(
<trim suffix="" suffixOverrides=",">
<if test="zbid != null"> ZBID , </if>
@ -1005,7 +1004,7 @@
<if test="lrrq != null and lrrq != ''"> LRRQ , </if>
<if test="lrsj != null and lrsj != ''"> LRSJ , </if>
<if test="shrid != null"> SHRID , </if>
<if test="shr != null and shr != ''"> SHR , </if>
<if test="auditor != null and auditor != ''"> SHR , </if>
<if test="shrq != null and shrq != ''"> SHRQ , </if>
<if test="shsj != null and shsj != ''"> SHSJ , </if>
<if test="pfrid != null"> PFRID , </if>
@ -1147,7 +1146,7 @@
<if test="lrrq != null and lrrq != ''"> #{lrrq} ,</if>
<if test="lrsj != null and lrsj != ''"> #{lrsj} ,</if>
<if test="shrid != null"> #{shrid} ,</if>
<if test="shr != null and shr != ''"> #{shr} ,</if>
<if test="auditor != null and auditor != ''"> #{auditor} ,</if>
<if test="shrq != null and shrq != ''"> #{shrq} ,</if>
<if test="shsj != null and shsj != ''"> #{shsj} ,</if>
<if test="pfrid != null"> #{pfrid} ,</if>
@ -1440,7 +1439,7 @@ update gbi_zbxmb set
<if test="lrrq != null and lrrq != ''"> LRRQ = #{lrrq},</if>
<if test="lrsj != null and lrsj != ''"> LRSJ = #{lrsj},</if>
<if test="shrid != null"> SHRID = #{shrid},</if>
<if test="shr != null and shr != ''"> SHR = #{shr},</if>
<if test="auditor != null and auditor != ''"> SHR = #{auditor},</if>
<if test="shrq != null and shrq != ''"> SHRQ = #{shrq},</if>
<if test="shsj != null and shsj != ''"> SHSJ = #{shsj},</if>
<if test="pfrid != null"> PFRID = #{pfrid},</if>
@ -1479,7 +1478,7 @@ update gbi_zbxmb set
<if test="kzzl7mc != null and kzzl7mc != ''"> KZZL7MC = #{kzzl7mc},</if>
<if test="edwzc != null and edwzc != ''"> EDWZC = #{edwzc},</if>
</trim>
where ZBID = #{zbid}
where ZBID = #{zbid} and KJND=#{kjnd} and GSDM=#{gsdm} and ZBDM = #{zbdm}
</update>
<!-- 逻辑删除 -->
<update id="entity_logicDelete" parameterType = "com.hzya.frame.grpU8.nxproof.gbizbxmb.entity.GbiZbxmbEntity" >
@ -1642,5 +1641,11 @@ update gbi_zbxmb set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{
delete from gbi_zbxmb where ZBID = #{zbid}
</delete>
<!--通过会计年度,公司代码,指标,指标代码删除-->
<delete id="GbiZbxmbEntity_delete_zbxmb">
delete from gbi_zbxmb where ZBID = #{zbid} and KJND=#{kjnd} and GSDM=#{gsdm} and ZBDM = #{zbdm}
</delete>
</mapper>

View File

@ -39,4 +39,14 @@ public interface IGbiZbxmbService extends IBaseService<GbiZbxmbEntity, String>{
* @Date 2024/8/7 14:50
* **/
Object deleteGbiZbxmb(JSONObject jsonObject);
/**
*
* @content 查询项目指标
* @Param
* @Return
* @Author hecan
* @Date 2024/8/28 15:47
* **/
Object queryEntityPage(JSONObject json);
}

View File

@ -2,6 +2,7 @@ package com.hzya.frame.grpU8.nxproof.gbizbxmb.service.impl;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
import com.hzya.frame.grpU8.nxproof.gbizbxmb.entity.GbiZbxmbEntity;
import com.hzya.frame.grpU8.nxproof.gbizbxmb.dao.IGbiZbxmbDao;
import com.hzya.frame.grpU8.nxproof.gbizbxmb.service.IGbiZbxmbService;
@ -19,11 +20,13 @@ import com.hzya.frame.grpU8.nxproof.zbzbly.dao.IZbZblyDao;
import com.hzya.frame.grpU8.nxproof.zbzbly.entity.ZbZblyEntity;
import com.hzya.frame.web.entity.BaseResult;
import com.hzya.frame.web.entity.JsonResultEntity;
import org.apache.commons.collections.CollectionUtils;
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;
import java.util.UUID;
/**
@ -69,8 +72,26 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
if(!checkStr(jsonObject.getString("zblb"))){
return BaseResult.getFailureMessageEntity("请传递指标类别");
}
if(!checkStr(jsonObject.getString("zbid"))){
return BaseResult.getFailureMessageEntity("请传递指标id");
}
if(!checkStr(jsonObject.getString("zbdm"))){
return BaseResult.getFailureMessageEntity("请传递指标代码");
}
if(!checkStr(jsonObject.getString("lrrq"))){
return BaseResult.getFailureMessageEntity("请传递录入日期");
}
if(!checkStr(jsonObject.getString("lrsj"))){
return BaseResult.getFailureMessageEntity("请传递录入时间");
}
if(!checkStr(jsonObject.getString("ysfadm"))){
return BaseResult.getFailureMessageEntity("请传递预算方案代码");
}
if(!checkStr(jsonObject.getString("ysfamc"))){
return BaseResult.getFailureMessageEntity("请传递预算方案名称");
}
GbiZbxmbEntity gbiZbxmbEntity = jsonObject.toJavaObject(GbiZbxmbEntity.class);
try {
/*try {
//查询指标id最大值和指标代码最大值
GbiZbxmbEntity gbiZbxmbEntityZbid = gbiZbxmbDao.queryZbidAndZbdm(gbiZbxmbEntity);
gbiZbxmbEntity.setZbid(gbiZbxmbEntityZbid.getZbid());
@ -79,27 +100,45 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
logger.info("根据会计年度:{},公司代码:{},指标类别:{}获取指标id和指标代码失败:{}",
jsonObject.getString("kjnd"),jsonObject.getString("gsdm"),jsonObject.getString("zblb"),e.getMessage());
return BaseResult.getFailureMessageEntity("获取指标id和指标代码失败");
}*/
try {
GbiZbxmbEntity gbiZbxmb=new GbiZbxmbEntity();
gbiZbxmb.setKjnd(gbiZbxmbEntity.getKjnd());
gbiZbxmb.setGsdm(gbiZbxmbEntity.getGsdm());
gbiZbxmb.setZbid(gbiZbxmbEntity.getZbid());
gbiZbxmb.setZbdm(gbiZbxmbEntity.getZbdm());
gbiZbxmb.setDataSourceCode(gbiZbxmbEntity.getDataSourceCode());
List<GbiZbxmbEntity> gbiZbxmbEntities = gbiZbxmbDao.queryGbiZbxmbEntity(gbiZbxmb);
if(CollectionUtils.isNotEmpty(gbiZbxmbEntities)){
logger.info("指标id{}和编码:{}在公司代码为:{}和会计年度为{}中已经存在",gbiZbxmbEntity.getZbid(),gbiZbxmbEntity.getZbdm(),gbiZbxmbEntity.getGsdm(),gbiZbxmbEntity.getKjnd());
return BaseResult.getFailureMessageEntity("该指标已经存在,不保存");
}
}catch (Exception e){
logger.info("根据指标id,指标编码,会计年度,公司代码查询指标是否存在失败:{}",gbiZbxmbEntity.getZbid(),gbiZbxmbEntity.getZbdm(),gbiZbxmbEntity.getKjnd(),gbiZbxmbEntity.getGsdm(),e.getMessage());
return BaseResult.getFailureMessageEntity("保存指标失败");
}
//更新其他表得使用状态
JsonResultEntity jsonResultEntity = updateOtherTable(gbiZbxmbEntity);
//保存指标项目表
try {
gbiZbxmbEntity.setZt("1");//状态为1为保存
gbiZbxmbEntity.setZt("3");
gbiZbxmbEntity.setIdzbbh(String.valueOf(UUID.randomUUID()));//IDZBBH
gbiZbxmbEntity.setSfjz("0");//是否结转
gbiZbxmbEntity.setCyskzfs("0");//超预算控制方式
gbiZbxmbEntity.setYjbfb(100.00);//预警百分比
gbiZbxmbEntity.setPfrid(-1);//批复人id
gbiZbxmbEntity.setShrid(-1);//审核人id
//gbiZbxmbEntity.setPfrid(-1);//批复人id
//gbiZbxmbEntity.setShrid(-1);//审核人id
gbiZbxmbEntity.setSjly(1);//数据来源
gbiZbxmbEntity.setXfzt("0");//下发状态
gbiZbxmbEntity.setNcysy(0.00);//年初已使用
gbiZbxmbEntity.setSjzbid(0);//上级指标id
gbiZbxmbEntity.setModule("全部");//模块
logger.info("=========开始保存指标项目表=========");
GbiZbxmbEntity save = gbiZbxmbDao.save(gbiZbxmbEntity);
GbiZbxmbEntity save = gbiZbxmbDao.saveGbiZbxmbEntity(gbiZbxmbEntity);
logger.info("==========指标项目表保存完毕======");
GlCzrzEntity glCzrzEntity=new GlCzrzEntity();
glCzrzEntity.setDataSourceCode(gbiZbxmbEntity.getDataSourceCode());
glCzrzEntity.setStation("yusuanzhibiaobaocun");
logger.info("==========开始查询操作日志的最大值no======");
GlCzrzEntity glCzrzEntityNo = glCzrzDao.queryCzrzNo(glCzrzEntity);
@ -108,14 +147,14 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
glCzrzEntity.setName("0.指标保存");
glCzrzEntity.setCznr("增加指标"+gbiZbxmbEntity.getZbid()+"(MXZB)");
logger.info("==========开始保存操作日志======");
glCzrzDao.save(glCzrzEntity);
glCzrzDao.saveGlCzrzEntity(glCzrzEntity);
logger.info("==========操作日志保存完毕======");
JSONObject jsonObjectSave=new JSONObject();
jsonObjectSave.put("status","200");
jsonObjectSave.put("zbxm",save);
return jsonObjectSave;
}catch (Exception e){
logger.info("保存预算指标失败:{}",e.getMessage());
logger.info("根据会计年度:{},公司代码:{},指标id:{},指标代码:{}保存项目指标失败:{}",gbiZbxmbEntity.getKjnd(),gbiZbxmbEntity.getGsdm(),gbiZbxmbEntity.getZbid(),gbiZbxmbEntity.getZbdm(),e.getMessage());
return BaseResult.getFailureMessageEntity("保存指标失败");
}
}
@ -135,15 +174,20 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
if(!checkStr(jsonObject.getString("zbid"))){
return BaseResult.getFailureMessageEntity("请传递指标id");
}
if(!checkStr(jsonObject.getString("zbdm"))){
return BaseResult.getFailureMessageEntity("请传递指标代码");
}
GbiZbxmbEntity gbiZbxmbEntity = jsonObject.toJavaObject(GbiZbxmbEntity.class);
try {
JsonResultEntity jsonResultEntity = updateOtherTable(gbiZbxmbEntity);
gbiZbxmbEntity.setZt("1");
gbiZbxmbEntity.setZt("3");
gbiZbxmbEntity.setModule("全部");//模块
gbiZbxmbEntity.setNcysy(0.00);//年初已使用
logger.info("=========开始更新指标项目表=========");
GbiZbxmbEntity save = gbiZbxmbDao.update(gbiZbxmbEntity);
GbiZbxmbEntity save = gbiZbxmbDao.updateGbiZbxmbEntity(gbiZbxmbEntity);
logger.info("==========指标项目表更新完毕======");
GlCzrzEntity glCzrzEntity=new GlCzrzEntity();
glCzrzEntity.setDataSourceCode(gbiZbxmbEntity.getDataSourceCode());
glCzrzEntity.setStation("yusuanzhibiaobaocun");
logger.info("==========开始查询操作日志的最大值no======");
GlCzrzEntity glCzrzEntityNo = glCzrzDao.queryCzrzNo(glCzrzEntity);
@ -152,7 +196,7 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
glCzrzEntity.setName("0.指标修改");
glCzrzEntity.setCznr("修改指标"+gbiZbxmbEntity.getZbid()+"(MXZB)");
logger.info("==========开始保存操作日志======");
glCzrzDao.save(glCzrzEntity);
glCzrzDao.saveGlCzrzEntity(glCzrzEntity);
logger.info("==========操作日志保存完毕======");
JSONObject jsonObjectUpdate =new JSONObject();
jsonObjectUpdate.put("status","200");
@ -179,13 +223,17 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
if(!checkStr(jsonObject.getString("zbid"))){
return BaseResult.getFailureMessageEntity("请传递指标id");
}
if(!checkStr(jsonObject.getString("zbdm"))){
return BaseResult.getFailureMessageEntity("请传递指标代码");
}
GbiZbxmbEntity gbiZbxmbEntity = jsonObject.toJavaObject(GbiZbxmbEntity.class);
try {
gbiZbxmbEntity.setZt("1");
gbiZbxmbEntity.setZt("3");
logger.info("=========开始删除指标项目表=========");
int delete = gbiZbxmbDao.delete("entity_delete", gbiZbxmbEntity);
int delete = gbiZbxmbDao.deleteGbiZbxmbEntity(gbiZbxmbEntity);
logger.info("==========指标项目表删除完毕======");
GlCzrzEntity glCzrzEntity=new GlCzrzEntity();
glCzrzEntity.setDataSourceCode(gbiZbxmbEntity.getDataSourceCode());
glCzrzEntity.setStation("yusuanzhibiaobaocun");
logger.info("==========开始查询操作日志的最大值no======");
GlCzrzEntity glCzrzEntityNo = glCzrzDao.queryCzrzNo(glCzrzEntity);
@ -194,7 +242,7 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
glCzrzEntity.setName("0.指标删除");
glCzrzEntity.setCznr("删除指标"+gbiZbxmbEntity.getZbid()+"(MXZB)");
logger.info("==========开始保存操作日志======");
glCzrzDao.save(glCzrzEntity);
glCzrzDao.saveGlCzrzEntity(glCzrzEntity);
logger.info("==========操作日志保存完毕======");
JSONObject jsonObjectDelete =new JSONObject();
jsonObjectDelete.put("status","200");
@ -206,6 +254,30 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
}
}
//查询项目指标
@Override
public Object queryEntityPage(JSONObject json) {
JSONObject jsonObject = json.getJSONObject("jsonStr");
if(!checkStr(jsonObject.getString("gsdm"))){
return BaseResult.getFailureMessageEntity("请传递公司代码");
}
if(!checkStr(jsonObject.getString("kjnd"))){
return BaseResult.getFailureMessageEntity("请传递会计年度");
}
GbiZbxmbEntity gbiZbxmbEntity = jsonObject.toJavaObject(GbiZbxmbEntity.class);
try {
List<GbiZbxmbEntity> gbiZbxmbEntities = gbiZbxmbDao.queryGbiZbxmbEntity(gbiZbxmbEntity);
JSONObject object=new JSONObject();
PageInfo pageInfo=new PageInfo(gbiZbxmbEntities);
object.put("pageInfo",pageInfo);
object.put("status","200");
return object;
}catch (Exception e){
logger.info("根据公司代码:{},会计年度:{},指标代码:{}指标id:{}查询指标项目失败:{}",gbiZbxmbEntity.getGsdm(),gbiZbxmbEntity.getKjnd(),gbiZbxmbEntity.getZbdm(),gbiZbxmbEntity.getZbid(),e.getMessage());
return BaseResult.getFailureMessageEntity("查询指标失败");
}
}
private JsonResultEntity updateOtherTable(GbiZbxmbEntity gbiZbxmbEntity){
try {
@ -216,8 +288,9 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
pubbmxxEntity.setGsdm(gbiZbxmbEntity.getGsdm());
pubbmxxEntity.setKjnd(gbiZbxmbEntity.getKjnd());
pubbmxxEntity.setBmdm(gbiZbxmbEntity.getBmdm());
pubbmxxEntity.setDataSourceCode(gbiZbxmbEntity.getDataSourceCode());
pubbmxxEntity.setSyzt("1");
pubbmxxDao.update(pubbmxxEntity);
pubbmxxDao.updatePubbmxxHealthBureau(pubbmxxEntity);
logger.info("===========更新部门信息得使用状态完毕=========");
}
}catch (Exception e){
@ -231,9 +304,10 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
glXmzlEntity.setGsdm(gbiZbxmbEntity.getGsdm());
glXmzlEntity.setKjnd(gbiZbxmbEntity.getKjnd());
glXmzlEntity.setXmdm(gbiZbxmbEntity.getXmdm());
glXmzlEntity.setDataSourceCode(gbiZbxmbEntity.getDataSourceCode());
glXmzlEntity.setSyzt("1");
logger.info("===========开始更新项目资料得使用状态=========");
glXmzlDao.update(glXmzlEntity);
glXmzlDao.updateGlXmzlHealthBureau(glXmzlEntity);
logger.info("===========更新项目资料得使用状态完毕=========");
}
}catch (Exception e){
@ -247,9 +321,10 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
zbWhszEntity.setGsdm(gbiZbxmbEntity.getGsdm());
zbWhszEntity.setKjnd(gbiZbxmbEntity.getKjnd());
zbWhszEntity.setWhdm(gbiZbxmbEntity.getWhdm());
zbWhszEntity.setDataSourceCode(gbiZbxmbEntity.getDataSourceCode());
zbWhszEntity.setSyzt("1");
logger.info("===========开始更新文号得使用状态=========");
zbWhszDao.update(zbWhszEntity);
zbWhszDao.updateZbWhszEntity(zbWhszEntity);
logger.info("===========更新文号得使用状态完毕=========");
}
}catch (Exception e){
@ -263,9 +338,10 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
zblyEntity.setGsdm(gbiZbxmbEntity.getGsdm());
zblyEntity.setKjnd(gbiZbxmbEntity.getKjnd());
zblyEntity.setZblydm(gbiZbxmbEntity.getZblydm());
zblyEntity.setDataSourceCode(gbiZbxmbEntity.getDataSourceCode());
zblyEntity.setSyzt("1");
logger.info("===========开始更新指标来源得使用状态=========");
zbZblyDao.update(zblyEntity);
zbZblyDao.updateZbZblyEntity(zblyEntity);
logger.info("===========更新指标来源得使用状态完毕=========");
}
}catch (Exception e){
@ -278,13 +354,14 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
GlFzxzlEntity glFzxzlEntity=new GlFzxzlEntity();
glFzxzlEntity.setGsdm(gbiZbxmbEntity.getGsdm());
glFzxzlEntity.setKjnd(gbiZbxmbEntity.getKjnd());
glFzxzlEntity.setDataSourceCode(gbiZbxmbEntity.getDataSourceCode());
glFzxzlEntity.setSyzt("1");
try {
if(StrUtil.isNotEmpty(gbiZbxmbEntity.getJjkmdm()) && StrUtil.isNotEmpty(gbiZbxmbEntity.getJjkmmc())) {
logger.info("===========开始更新辅助项资料(部门经济科目)得使用状态=========");
glFzxzlEntity.setFzdm(gbiZbxmbEntity.getJjkmdm());
glFzxzlEntity.setLbdm("5");
glFzxzlDao.update(glFzxzlEntity);
glFzxzlDao.updateGlFzxzlEntity(glFzxzlEntity);
logger.info("===========更新辅助项资料(部门经济科目)得使用状态完毕=========");
}
}catch (Exception e){
@ -297,7 +374,7 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
glFzxzlEntity.setLbdm("6");
glFzxzlEntity.setFzdm(gbiZbxmbEntity.getFz6dm());
logger.info("===========开始更新辅助项资料(资金性质)得使用状态=========");
glFzxzlDao.update(glFzxzlEntity);
glFzxzlDao.updateGlFzxzlEntity(glFzxzlEntity);
logger.info("===========更新辅助项资料(资金性质)得使用状态完毕=========");
}
}catch (Exception e){
@ -310,7 +387,7 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
glFzxzlEntity.setLbdm("8");
glFzxzlEntity.setFzdm(gbiZbxmbEntity.getFz8dm());
logger.info("===========开始更新辅助项资料(国库项目)得使用状态=========");
glFzxzlDao.update(glFzxzlEntity);
glFzxzlDao.updateGlFzxzlEntity(glFzxzlEntity);
logger.info("===========更新辅助项资料(国库项目)得使用状态完毕=========");
}
}catch (Exception e){
@ -323,7 +400,7 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
glFzxzlEntity.setLbdm("9");
glFzxzlEntity.setFzdm(gbiZbxmbEntity.getFz9dm());
logger.info("===========开始更新辅助项资料(经费类型I)得使用状态=========");
glFzxzlDao.update(glFzxzlEntity);
glFzxzlDao.updateGlFzxzlEntity(glFzxzlEntity);
logger.info("===========更新辅助项资料(经费类型I)得使用状态完毕=========");
}
}catch (Exception e){

View File

@ -84,6 +84,7 @@ public interface ISenderGlPzmlDao extends IBaseDao<SenderGlPzmlEntity, String> {
* **/
Integer deleteGlPzmlHealthBureau(SenderGlPzmlEntity senderGlPzmlEntity);
SenderGlPzmlEntity queryPzmlByIdpzh(SenderGlPzmlEntity entity);
/**
*
* @content 查询凭证 商学院
@ -94,7 +95,5 @@ public interface ISenderGlPzmlDao extends IBaseDao<SenderGlPzmlEntity, String> {
* **/
List<SenderGlPzmlEntity> queryGlPzmlSxy(SenderGlPzmlEntity senderGlPzmlEntity);
}

View File

@ -3,6 +3,8 @@ 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.acctVouchInfo.entity.AcctVouchInfoEntity;
import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntityVo;
import com.hzya.frame.grpU8.nxproof.glPzml.dao.ISenderGlPzmlDao;
import com.hzya.frame.grpU8.nxproof.glPzml.entity.SenderGlPzmlEntity;
import org.springframework.stereotype.Repository;
@ -67,5 +69,16 @@ public class SenderGlPzmlDaoImpl extends MybatisGenericDao<SenderGlPzmlEntity, S
public List<SenderGlPzmlEntity> queryGlPzmlSxy(SenderGlPzmlEntity senderGlPzmlEntity) {
return (List<SenderGlPzmlEntity>) super.selectList("queryGlPzmlSxy",senderGlPzmlEntity);
}
@DS("#entity.dataSourceCode")
@Override
public SenderGlPzmlEntity queryPzmlByIdpzh(SenderGlPzmlEntity entity) {
return super.queryOne(entity);
}
}

View File

@ -1,8 +1,11 @@
package com.hzya.frame.grpU8.nxproof.glPzml.entity;
import com.hzya.frame.grpU8.nxproof.glPznr.entity.SenderGlPznrEntity;
import com.hzya.frame.web.entity.BaseEntity;
import java.util.List;
/**
* (GlPzml)实体类
*
@ -64,6 +67,7 @@ public class SenderGlPzmlEntity extends BaseEntity {
this.bmdm = bmdm;
}
private List<SenderGlPznrEntity> senderGlPznrEntities;
public String getPzsbm() {
return pzsbm;
}
@ -376,6 +380,12 @@ public class SenderGlPzmlEntity extends BaseEntity {
this.yspzzs = yspzzs;
}
public List<SenderGlPznrEntity> getSenderGlPznrEntities() {
return senderGlPznrEntities;
}
public void setSenderGlPznrEntities(List<SenderGlPznrEntity> senderGlPznrEntities) {
this.senderGlPznrEntities = senderGlPznrEntities;
}
}

View File

@ -262,25 +262,23 @@
<!-- 查询列表 商学院所需要的凭证数据-->
<select id="queryGlPzmlSxy" resultMap="get-SenderGlPzmlEntity-result" parameterType = "com.hzya.frame.grpU8.nxproof.glPzml.entity.SenderGlPzmlEntity">
select
pzml.idpzh as idpzh,
pzml.kjqj as kjqj,
pzml.srrq as srrq,
pzml.srID as srID,
pznr.bmdm as bmdm,
pzml.pzzy as pzzy,
sum(pznr.je) as pzje,
pzml.gsdm,pzml.zth,pzml.kjqj,pzml.pzh
pzml.idpzh as idpzh,
pzml.kjqj as kjqj,
pzml.srrq as srrq,
pzml.pzzy as pzzy,
sum(pznr.je) as pzje,
pzml.gsdm,pzml.zth,pzml.kjqj,pzml.pzh
from GL_Pzml pzml
left join gl_pznr pznr on pznr.idpzh=pzml.idpzh and pzml.kjqj=pznr.kjqj
left join gl_pznr pznr on pznr.idpzh=pzml.idpzh and pzml.kjqj=pznr.kjqj
<trim prefix="where" prefixOverrides="and">
<if test="idpzh !=null and idpzh!='' "> and pzml.idpzh = #{idpzh} </if>
and pzml.kjqj =#{kjqj} and pznr.kjqj =#{kjqj} and pznr.zbid!=0
and (pzml.srrq>=#{srrq} or pzml.shrq >=#{shrq} or pzml.jzrq>=#{jzrq}) and pznr.zbid!=0
</trim>
group by pzml.idpzh,
pzml.kjqj,
pzml.srrq,
pzml.pzzy,
pzml.gsdm,pzml.zth,pzml.kjqj,pzml.pzh,pzml.srID,pznr.bmdm
pzml.gsdm,pzml.zth,pzml.kjqj,pzml.pzh
</select>

View File

@ -99,6 +99,11 @@ public interface ISenderGlPzmlService extends IBaseService<SenderGlPzmlEntity, S
* @Param
* @Return
* @Author hecan
*
* @content 查询凭证 商学院 确定指标被哪些凭证使用
* @Param
* @Return
* @Author hecan
* @Date 2024/8/13 17:00
* **/
Object queryGlPzmlSxy(JSONObject jsonObject);

View File

@ -1,6 +1,5 @@
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 cn.hutool.http.HttpRequest;
@ -8,10 +7,6 @@ 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.gbizbsyrec.dao.IGbiZbsyrecDao;
import com.hzya.frame.grpU8.nxproof.gbizbsyrec.entity.GbiZbsyrecEntity;
import com.hzya.frame.grpU8.nxproof.gbizbxmb.dao.IGbiZbxmbDao;
import com.hzya.frame.grpU8.nxproof.gbizbxmb.entity.GbiZbxmbEntity;
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;
@ -20,19 +15,16 @@ 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.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import static org.aspectj.runtime.internal.Conversions.doubleValue;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
/**
* (GlPzml)表服务实现类
@ -48,9 +40,6 @@ public class SenderGlPzmlServiceImpl extends BaseService<SenderGlPzmlEntity, Str
private ISenderGlPzmlDao senderGlPzmlDao;
@Autowired
private IGbiZbxmbDao gbiZbxmbDao;
@Autowired
public void setSenderGlPzmlDao(ISenderGlPzmlDao dao) {
this.senderGlPzmlDao = dao;
@ -681,8 +670,14 @@ public class SenderGlPzmlServiceImpl extends BaseService<SenderGlPzmlEntity, Str
public Object queryGlPzmlSxy(JSONObject json){
JSONObject jsonObject = json.getJSONObject("jsonStr");
SenderGlPzmlEntity glPzmlEntity = jsonObject.toJavaObject(SenderGlPzmlEntity.class);
if(StrUtil.isEmpty(glPzmlEntity.getKjqj())){
glPzmlEntity.setKjqj(DateUtil.format(new Date(),"yyyyMM"));
if(StrUtil.isEmpty(glPzmlEntity.getSrrq())){
glPzmlEntity.setSrrq(DateUtil.format(new Date(),"yyyyMMdd"));
}
if(StrUtil.isEmpty(glPzmlEntity.getShrq())){
glPzmlEntity.setShrq(DateUtil.format(new Date(),"yyyyMMdd"));
}
if(StrUtil.isEmpty(glPzmlEntity.getJzrq())){
glPzmlEntity.setJzrq(DateUtil.format(new Date(),"yyyyMMdd"));
}
//获取token
String token = getToken();
@ -711,29 +706,26 @@ public class SenderGlPzmlServiceImpl extends BaseService<SenderGlPzmlEntity, Str
jsonObjectParams.put("code",pzmlEntity.getIdpzh());//pzid
jsonObjectParams.put("budgetYear",pzmlEntity.getKjqj().substring(0,4));//预算年度
jsonObjectParams.put("applyDate",outputDateString);//日期
jsonObjectParams.put("userCode",pzmlEntity.getSrid());//用户编码
jsonObjectParams.put("depCode","A518");//部门编码
jsonObjectParams.put("description",pzmlEntity.getPzzy());//说明
jsonObjectParams.put("amount",roundedValue.doubleValue());//金额
jsonObjectParams.put("pzNum",pzNum);//凭证号 例如公司代码+账套号+会计期间+凭证号001_001_202408_付款_1
//根据idpzh查询指标id和指标金额
GbiZbxmbEntity gbiZbxmbEntity=new GbiZbxmbEntity();
gbiZbxmbEntity.setDjId(pzmlEntity.getIdpzh());
gbiZbxmbEntity.setKjnd(pzmlEntity.getKjqj().substring(0,4));
gbiZbxmbEntity.setDataSourceCode(glPzmlEntity.getDataSourceCode());
List<GbiZbxmbEntity> gbiZbsyrecEntities = gbiZbxmbDao.queryZbxmbByIdpzh(gbiZbxmbEntity);
logger.info("=======根据凭证idpzh:{}查询的指标金额和指标id数据有{}条",pzmlEntity.getIdpzh(),gbiZbsyrecEntities.size());
if(CollectionUtils.isEmpty(gbiZbsyrecEntities)){
//根据idpzh查询指标id和指标金额以及部门经济科目
SenderGlPznrEntity senderGlPznrEntity=new SenderGlPznrEntity();
senderGlPznrEntity.setIdpzh(pzmlEntity.getIdpzh());
senderGlPznrEntity.setDataSourceCode(glPzmlEntity.getDataSourceCode());
List<SenderGlPznrEntity> senderGlPznrEntities = senderGlPznrDao.queryGlPznrSxy(senderGlPznrEntity);
logger.info("=======根据凭证idpzh:{}查询的指标金额和指标id以及部门经济科目数据有{}条",pzmlEntity.getIdpzh(),senderGlPznrEntities.size());
if(CollectionUtils.isEmpty(senderGlPznrEntities)){
jsonObjectParams.put("reimburseItems",new ArrayList<>());
}else{
JSONArray jsonArray=new JSONArray();
for (GbiZbxmbEntity zbxmbEntity : gbiZbsyrecEntities) {
BigDecimal bigDecimalValueZbxmb = new BigDecimal(zbxmbEntity.getJe());
for (SenderGlPznrEntity glPznrEntity : senderGlPznrEntities) {
BigDecimal bigDecimalValueZbxmb = new BigDecimal(glPznrEntity.getJe());
BigDecimal roundedValueZbxmb = bigDecimalValueZbxmb.setScale(2, RoundingMode.HALF_UP);
JSONObject jsonObjectZbxm=new JSONObject();
jsonObjectZbxm.put("thirdProjectCode",zbxmbEntity.getZbid());
jsonObjectZbxm.put("thirdProjectCode",glPznrEntity.getZbid());
jsonObjectZbxm.put("amount",roundedValueZbxmb);
jsonObjectZbxm.put("financialCode",zbxmbEntity.getJjkmdm());
jsonObjectZbxm.put("financialCode",glPznrEntity.getFzdm5());
jsonArray.add(jsonObjectZbxm);
}
jsonObjectParams.put("reimburseItems",jsonArray);
@ -744,7 +736,7 @@ public class SenderGlPzmlServiceImpl extends BaseService<SenderGlPzmlEntity, Str
jsonObjectData.put("data",jsonArray);
String params = jsonObjectData.toJSONString();
logger.info("调用商学院凭证保存接口请求参数:{}",params);
result = HttpRequest.post(URLTest + "/nky/service/zsApi/saveZJSYPZReimburse?accessToken="+token).header("Content-Type", "application/json;charset=UTF-8").timeout(30000).body(params).execute().body();
result = HttpRequest.post(URLTest + "/nky/service/zsApi/saveZJSYPZReimburse?accessToken="+token).header("Content-Type", "application/json;charset=UTF-8").timeout(30000).body(params).execute().body();
logger.info("调用商学院凭证保存接口返回参数:{}",result);
}
JSONObject jsonObjectResult=new JSONObject();

View File

@ -94,5 +94,8 @@ public interface ISenderGlPznrDao extends IBaseDao<SenderGlPznrEntity, String> {
* **/
Integer deleteGlPznrHealthBureau(SenderGlPznrEntity senderGlPznrEntity);
List<SenderGlPznrEntity> querySenderGlPznrEntityByIdpzh(SenderGlPznrEntity senderGlPznrEntity);
List<SenderGlPznrEntity> queryGlPznrSxy(SenderGlPznrEntity senderGlPznrEntity);
}

View File

@ -4,6 +4,7 @@ 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.acctVouchInfo.entity.AcctVouchInfoEntityVo;
import com.hzya.frame.grpU8.nxproof.glPznr.dao.ISenderGlPznrDao;
import com.hzya.frame.grpU8.nxproof.glPznr.entity.SenderGlPznrEntity;
import org.springframework.stereotype.Repository;
@ -68,6 +69,18 @@ public class SenderGlPznrDaoImpl extends MybatisGenericDao<SenderGlPznrEntity, S
public Integer deleteGlPznrHealthBureau(SenderGlPznrEntity senderGlPznrEntity) {
return super.delete("SenderGlPznrEntity_delete_pznr",senderGlPznrEntity);
}
@DS("#senderGlPznrEntity.dataSourceCode")
@Override
public List<SenderGlPznrEntity> querySenderGlPznrEntityByIdpzh(SenderGlPznrEntity senderGlPznrEntity) {
List<SenderGlPznrEntity> o = (List<SenderGlPznrEntity>) super.selectList(getSqlIdPrifx() + "querySenderGlPznrEntityByIdpzh", senderGlPznrEntity);
return o;
}
@Override
@DS("#senderGlPznrEntity.dataSourceCode")
public List<SenderGlPznrEntity> queryGlPznrSxy(SenderGlPznrEntity senderGlPznrEntity) {
return (List<SenderGlPznrEntity>)super.selectList("queryGlPznrSxy",senderGlPznrEntity);
}
}

View File

@ -1,8 +1,11 @@
package com.hzya.frame.grpU8.nxproof.glPznr.entity;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.web.entity.BaseEntity;
import java.util.List;
/**
* (GlPznr)实体类
*
@ -109,7 +112,9 @@ private String hzflh;
private String cyxfx;
private String dqrq;
private String glidpznr;
private String fzhs;
private List<JSONObject> fzhslist;
private List<String> idpzhs;
public String getBxdid() {
return bxdid;
}
@ -814,5 +819,28 @@ private String glidpznr;
this.jfsqid = jfsqid;
}
public String getFzhs() {
return fzhs;
}
public void setFzhs(String fzhs) {
this.fzhs = fzhs;
}
public List<JSONObject> getFzhslist() {
return fzhslist;
}
public void setFzhslist(List<JSONObject> fzhslist) {
this.fzhslist = fzhslist;
}
public List<String> getIdpzhs() {
return idpzhs;
}
public void setIdpzhs(List<String> idpzhs) {
this.idpzhs = idpzhs;
}
}

View File

@ -91,6 +91,7 @@
<result property="cyxfx" column="cyxfx" jdbcType="VARCHAR"/>
<result property="dqrq" column="dqrq" jdbcType="VARCHAR"/>
<result property="glidpznr" column="glidpznr" jdbcType="VARCHAR"/>
<result property="fzhs" column="fzhs" jdbcType="VARCHAR"/>
</resultMap>
<!-- 查询的字段-->
<sql id = "SenderGlPznrEntity_Base_Column_List">
@ -144,7 +145,6 @@
, ZBID
, EDID
, JFSQID
, fzdm10
, fzdm11
, fzdm12
, fzdm13
@ -472,6 +472,10 @@
</trim>
</select>
<select id="queryGlPznrSxy" resultMap="get-SenderGlPznrEntity-result" parameterType = "com.hzya.frame.grpU8.nxproof.glPznr.entity.SenderGlPznrEntity">
select je,fzdm5,zbid from gl_pznr where zbid !=0 and idpzh=#{idpzh}
</select>
<!--新增所有列-->
<insert id="entity_insert" parameterType = "com.hzya.frame.grpU8.nxproof.glPznr.entity.SenderGlPznrEntity" keyProperty="" useGeneratedKeys="true">
insert into gl_pznr(
@ -891,6 +895,161 @@ update gl_pznr set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{mo
<if test="idpzh != null and idpzh!=''"> and idpzh = #{idpzh} </if>
</delete>
<!-- 分页查询列表 采用like格式 -->
<select id="querySenderGlPznrEntityByIdpzh" resultMap="get-SenderGlPznrEntity-result" parameterType = "com.hzya.frame.grpU8.nxproof.glPznr.entity.SenderGlPznrEntity">
select
pznr.gsdm
, pznr.ZTH
, pznr.kjqj
, pznr.pzly
, pznr.pzh
, pznr.pzlxdm
, pznr.kjtxdm
, pznr.flh
, pznr.zy
, pznr.kmdm
, pznr.wbdm
, pznr.hl
, pznr.jdbz
, pznr.wbje
, pznr.je
, pznr.spz
, pznr.wldrq
, pznr.sl
, pznr.dj
, pznr.bmdm
, pznr.wldm
, pznr.xmdm
, pznr.fzsm1
, pznr.fzsm2
, pznr.fzsm3
, pznr.fzsm4
, pznr.fzsm5
, pznr.fzsm6
, pznr.fzsm7
, pznr.fzsm8
, pznr.fzsm9
, pznr.cess
, pznr.fplx
, pznr.fprq
, pznr.fphfw1
, pznr.fphfw2
, pznr.jsfs
, pznr.zydm
, pznr.fzdm4
, pznr.fzdm5
, pznr.fzdm6
, pznr.fzdm7
, pznr.fzdm8
, pznr.fzdm9
, pznr.fzdm10
, pznr.IDPZNR
, pznr.wlh
, pznr.ZBID
, pznr.EDID
, pznr.JFSQID
, pznr.fzdm10
, pznr.fzdm11
, pznr.fzdm12
, pznr.fzdm13
, pznr.fzdm14
, pznr.fzdm15
, pznr.fzdm16
, pznr.fzdm17
, pznr.fzdm18
, pznr.fzdm19
, pznr.fzdm20
, pznr.fzdm21
, pznr.fzdm22
, pznr.fzdm23
, pznr.fzdm24
, pznr.fzdm25
, pznr.fzdm26
, pznr.fzdm27
, pznr.fzdm28
, pznr.fzdm29
, pznr.fzdm30
, pznr.idpzh
, pznr.skrlx
, pznr.skrmc
, pznr.skrzh
, pznr.skryhdm
, pznr.skryhhh
, pznr.skryhmc
, pznr.yszccy
, pznr.xsflh
, pznr.bxdid
, pznr.htid
, pznr.zckpbh
, pznr.sflx
, pznr.djbh
, pznr.hzflh
, pznr.cyxfx
, pznr.dqrq
, pznr.glidpznr
, kmxx.fzhs
from gl_pznr pznr
LEFT JOIN gl_kmxx kmxx ON kmxx.KMDM = pznr.kmdm AND kmxx.gsdm = pznr.gsdm AND kmxx.zth = pznr.ZTH AND kmxx.kjnd = LEFT ( pznr.kjqj, 4 )
<trim prefix="where" prefixOverrides="and">
<if test="gsdm != null and gsdm != ''"> and pznr.gsdm like concat('%',#{gsdm},'%') </if>
<if test="zth != null and zth != ''"> and pznr.ZTH like concat('%',#{zth},'%') </if>
<if test="kjqj != null and kjqj != ''"> and pznr.kjqj like concat('%',#{kjqj},'%') </if>
<if test="pzly != null and pzly != ''"> and pznr.pzly like concat('%',#{pzly},'%') </if>
<if test="pzh != null and pzh != ''"> and pznr.pzh like concat('%',#{pzh},'%') </if>
<if test="flh != null"> and pznr.flh like concat('%',#{flh},'%') </if>
<if test="zy != null and zy != ''"> and pznr.zy like concat('%',#{zy},'%') </if>
<if test="kmdm != null and kmdm != ''"> and pznr.kmdm like concat('%',#{kmdm},'%') </if>
<if test="wbdm != null and wbdm != ''"> and pznr.wbdm like concat('%',#{wbdm},'%') </if>
<if test="hl != null"> and pznr.hl like concat('%',#{hl},'%') </if>
<if test="jdbz != null and jdbz != ''"> and pznr.jdbz like concat('%',#{jdbz},'%') </if>
<if test="wbje != null"> and pznr.wbje like concat('%',#{wbje},'%') </if>
<if test="je != null"> and pznr.je like concat('%',#{je},'%') </if>
<if test="spz != null and spz != ''"> and pznr.spz like concat('%',#{spz},'%') </if>
<if test="wldrq != null and wldrq != ''"> and pznr.wldrq like concat('%',#{wldrq},'%') </if>
<if test="sl != null"> and pznr.sl like concat('%',#{sl},'%') </if>
<if test="dj != null"> and pznr.dj like concat('%',#{dj},'%') </if>
<if test="bmdm != null and bmdm != ''"> and pznr.bmdm like concat('%',#{bmdm},'%') </if>
<if test="wldm != null and wldm != ''"> and pznr.wldm like concat('%',#{wldm},'%') </if>
<if test="xmdm != null and xmdm != ''"> and pznr.xmdm like concat('%',#{xmdm},'%') </if>
<if test="fzsm1 != null and fzsm1 != ''"> and pznr.fzsm1 like concat('%',#{fzsm1},'%') </if>
<if test="fzsm2 != null and fzsm2 != ''"> and pznr.fzsm2 like concat('%',#{fzsm2},'%') </if>
<if test="fzsm3 != null and fzsm3 != ''"> and pznr.fzsm3 like concat('%',#{fzsm3},'%') </if>
<if test="fzsm4 != null and fzsm4 != ''"> and pznr.fzsm4 like concat('%',#{fzsm4},'%') </if>
<if test="fzsm5 != null and fzsm5 != ''"> and pznr.fzsm5 like concat('%',#{fzsm5},'%') </if>
<if test="fzsm6 != null and fzsm6 != ''"> and pznr.fzsm6 like concat('%',#{fzsm6},'%') </if>
<if test="fzsm7 != null and fzsm7 != ''"> and pznr.fzsm7 like concat('%',#{fzsm7},'%') </if>
<if test="fzsm8 != null and fzsm8 != ''"> and pznr.fzsm8 like concat('%',#{fzsm8},'%') </if>
<if test="fzsm9 != null and fzsm9 != ''"> and pznr.fzsm9 like concat('%',#{fzsm9},'%') </if>
<if test="cess != null"> and pznr.cess like concat('%',#{cess},'%') </if>
<if test="fplx != null and fplx != ''"> and pznr.fplx like concat('%',#{fplx},'%') </if>
<if test="fprq != null and fprq != ''"> and pznr.fprq like concat('%',#{fprq},'%') </if>
<if test="fphfw1 != null"> and pznr.fphfw1 like concat('%',#{fphfw1},'%') </if>
<if test="fphfw2 != null"> and pznr.fphfw2 like concat('%',#{fphfw2},'%') </if>
<if test="jsfs != null and jsfs != ''"> and pznr.jsfs like concat('%',#{jsfs},'%') </if>
<if test="zydm != null and zydm != ''"> and pznr.zydm like concat('%',#{zydm},'%') </if>
<if test="fzdm4 != null and fzdm4 != ''"> and pznr.fzdm4 like concat('%',#{fzdm4},'%') </if>
<if test="fzdm5 != null and fzdm5 != ''"> and pznr.fzdm5 like concat('%',#{fzdm5},'%') </if>
<if test="fzdm6 != null and fzdm6 != ''"> and pznr.fzdm6 like concat('%',#{fzdm6},'%') </if>
<if test="fzdm7 != null and fzdm7 != ''"> and pznr.fzdm7 like concat('%',#{fzdm7},'%') </if>
<if test="fzdm8 != null and fzdm8 != ''"> and pznr.fzdm8 like concat('%',#{fzdm8},'%') </if>
<if test="fzdm9 != null and fzdm9 != ''"> and pznr.fzdm9 like concat('%',#{fzdm9},'%') </if>
<if test="fzdm10 != null and fzdm10 != ''"> and pznr.fzdm10 like concat('%',#{fzdm10},'%') </if>
<if test="idpznr != null and idpznr != ''"> and pznr.IDPZNR like concat('%',#{idpznr},'%') </if>
<if test="idpzh != null and idpzh != ''"> and pznr.idpzh like concat('%',#{idpzh},'%') </if>
<if test="wlh != null and wlh != ''"> and pznr.wlh like concat('%',#{wlh},'%') </if>
<if test="zbid != null"> and pznr.ZBID like concat('%',#{zbid},'%') </if>
<if test="edid != null"> and pznr.EDID like concat('%',#{edid},'%') </if>
<if test="jfsqid != null"> and pznr.JFSQID like concat('%',#{jfsqid},'%') </if>
<if test="idpzhs != null and idpzhs.size > 0">
AND pznr.idpzh in
<foreach collection="idpzhs" item="item" index="index" open="(" close=")"
separator=",">
#{item}
</foreach>
</if>
</trim>
</select>
</mapper>

View File

@ -21,5 +21,15 @@ public interface IGlCzrzDao extends IBaseDao<GlCzrzEntity, String> {
* @Date 2024/8/6 15:45
* **/
GlCzrzEntity queryCzrzNo(GlCzrzEntity glCzrzEntity);
/**
*
* @content 保存操作日志
* @Param
* @Return
* @Author hecan
* @Date 2024/8/28 17:11
* **/
GlCzrzEntity saveGlCzrzEntity(GlCzrzEntity glCzrzEntity);
}

View File

@ -1,6 +1,7 @@
package com.hzya.frame.grpU8.nxproof.glczrz.dao.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
import com.hzya.frame.grpU8.nxproof.glczrz.dao.IGlCzrzDao;
import com.hzya.frame.grpU8.nxproof.glczrz.entity.GlCzrzEntity;
@ -15,8 +16,15 @@ import org.springframework.stereotype.Repository;
public class GlCzrzDaoImpl extends MybatisGenericDao<GlCzrzEntity, String> implements IGlCzrzDao {
@Override
@DS("#glCzrzEntity.dataSourceCode")
public GlCzrzEntity queryCzrzNo(GlCzrzEntity glCzrzEntity) {
return (GlCzrzEntity)super.selectOne("queryCzrzNo",glCzrzEntity);
}
@Override
@DS("#glCzrzEntity.dataSourceCode")
public GlCzrzEntity saveGlCzrzEntity(GlCzrzEntity glCzrzEntity) {
return super.save(glCzrzEntity);
}
}

View File

@ -106,10 +106,10 @@
<trim suffix="" suffixOverrides=",">
<if test="no != null"> no , </if>
<if test="name != null and name != ''"> name , </if>
<if test="date != null and date != ''"> date , </if>
<if test="zwrq != null and zwrq != ''"> zwrq , </if>
<if test="qssj != null and qssj != ''"> qssj , </if>
<if test="zzsj != null and zzsj != ''"> zzsj , </if>
date ,
zwrq ,
qssj ,
zzsj ,
<if test="cznr != null and cznr != ''"> cznr , </if>
<if test="cznrkz != null and cznrkz != ''"> CZNRKZ , </if>
<if test="station != null and station != ''"> station </if>
@ -118,10 +118,10 @@
<trim suffix="" suffixOverrides=",">
<if test="no != null"> #{no} ,</if>
<if test="name != null and name != ''"> #{name} ,</if>
<if test="date != null and date != ''"> select convert(char(8),getdate(),112),</if>
<if test="zwrq != null and zwrq != ''"> select convert(char(8),getdate(),112) ,</if>
<if test="qssj != null and qssj != ''"> select convert(char(8),getdate(),108) ,</if>
<if test="zzsj != null and zzsj != ''"> select convert(char(8),getdate(),108) ,</if>
<if test="date = null and date = ''"> convert(char(8),getdate(),112),</if>
<if test="zwrq = null and zwrq = ''"> convert(char(8),getdate(),112) ,</if>
<if test="qssj = null and qssj = ''"> convert(char(8),getdate(),108) ,</if>
<if test="zzsj = null and zzsj = ''"> convert(char(8),getdate(),108) ,</if>
<if test="cznr != null and cznr != ''"> #{cznr} ,</if>
<if test="cznrkz != null and cznrkz != ''"> #{cznrkz} ,</if>
<if test="station != null and station != ''"> #{station} </if>

View File

@ -1,8 +1,12 @@
package com.hzya.frame.grpU8.nxproof.glfzxzl.dao;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.basedao.dao.IBaseDao;
import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntity;
import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntityDto;
import java.util.List;
/**
* (GL_Fzxzl: table)表数据库访问层
@ -12,5 +16,26 @@ import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntity;
*/
public interface IGlFzxzlDao extends IBaseDao<GlFzxzlEntity, String> {
List<JSONObject> queryFzhs(GlFzxzlEntityDto glFzxzlEntityDto);
/**
*
* @content 查询辅助项资料
* @Param
* @Return
* @Author hecan
* @Date 2024/8/28 10:47
* **/
List<GlFzxzlEntity> queryGlFzxzlEntity(GlFzxzlEntity glFzxzlEntity);
/**
*
* @content 更新辅助项资料
* @Param
* @Return
* @Author hecan
* @Date 2024/8/28 17:14
* **/
GlFzxzlEntity updateGlFzxzlEntity(GlFzxzlEntity glFzxzlEntity);
}

View File

@ -1,10 +1,17 @@
package com.hzya.frame.grpU8.nxproof.glfzxzl.dao.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
import com.hzya.frame.grpU8.nxproof.glPznr.entity.SenderGlPznrEntity;
import com.hzya.frame.grpU8.nxproof.glfzxzl.dao.IGlFzxzlDao;
import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntity;
import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntityDto;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* (GlFzxzl)表数据库访问层
*
@ -13,6 +20,23 @@ import org.springframework.stereotype.Repository;
*/
@Repository(value = "GlFzxzlDaoImpl")
public class GlFzxzlDaoImpl extends MybatisGenericDao<GlFzxzlEntity, String> implements IGlFzxzlDao {
@DS("#glFzxzlEntityDto.dataSourceCode")
@Override
public List<JSONObject> queryFzhs(GlFzxzlEntityDto glFzxzlEntityDto) {
List<JSONObject> o = (List<JSONObject>) super.selectList(getSqlIdPrifx() + "queryFzhs", glFzxzlEntityDto);
return o;
}
@DS("#glFzxzlEntity.dataSourceCode")
@Override
public List<GlFzxzlEntity> queryGlFzxzlEntity(GlFzxzlEntity glFzxzlEntity) {
return super.queryByLike(glFzxzlEntity);
}
@Override
@DS("#glFzxzlEntity.dataSourceCode")
public GlFzxzlEntity updateGlFzxzlEntity(GlFzxzlEntity glFzxzlEntity) {
return super.update(glFzxzlEntity);
}
}

View File

@ -280,5 +280,32 @@ update GL_Fzxzl set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{m
delete from GL_Fzxzl where gsdm = #{gsdm}
</delete>
<!-- 分页查询列表 采用like格式 -->
<select id="queryFzhs" resultType="com.alibaba.fastjson.JSONObject" parameterType = "com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntityDto">
SELECT
fzxlb.lbdm,
fzxlb.gsdm,
fzxlb.kjnd,
fzxzl.fzdm,
fzxzl.fzmc
FROM
gl_fzxlb fzxlb
LEFT JOIN gl_fzxzl fzxzl ON fzxzl.kjnd= fzxlb.kjnd AND fzxzl.gsdm = fzxlb.gsdm AND fzxzl.lbdm = fzxlb.lbdm
<trim prefix="where" prefixOverrides="and">
<if test="sfyz != null and sfyz != ''"> and fzxlb.SFYZ = #{sfyz} </if>
<if test="glFzxzlNrEntityDtos != null and glFzxzlNrEntityDtos.size > 0">
and
<foreach collection="glFzxzlNrEntityDtos" index="index" item="item" open="(" separator="or" close=")">
( fzxlb.gsdm = #{item.gsdm}
AND fzxlb.kjnd = #{item.kjnd}
AND (
<foreach collection="item.glFzxzlNrDmEntityDtos" index="index1" item="item1" open="(" separator="or" close=")">
fzxlb.lbdm = #{item1.lbdm} AND fzxzl.fzdm = #{item1.fzdm}
</foreach>
) )
</foreach>
</if>
</trim>
</select>
</mapper>

View File

@ -0,0 +1,30 @@
package com.hzya.frame.grpU8.nxproof.glfzxzl.entity;
import com.hzya.frame.web.entity.BaseEntity;
import java.util.List;
public class GlFzxzlEntityDto extends BaseEntity {
private String sfyz;
private List<GlFzxzlNrEntityDto> glFzxzlNrEntityDtos;
public String getSfyz() {
return sfyz;
}
public void setSfyz(String sfyz) {
this.sfyz = sfyz;
}
public List<GlFzxzlNrEntityDto> getGlFzxzlNrEntityDtos() {
return glFzxzlNrEntityDtos;
}
public void setGlFzxzlNrEntityDtos(List<GlFzxzlNrEntityDto> glFzxzlNrEntityDtos) {
this.glFzxzlNrEntityDtos = glFzxzlNrEntityDtos;
}
}

View File

@ -0,0 +1,29 @@
package com.hzya.frame.grpU8.nxproof.glfzxzl.entity;
import com.hzya.frame.web.entity.BaseEntity;
public class GlFzxzlNrDmEntityDto extends BaseEntity {
private String lbdm;
private String fzdm;
public String getLbdm() {
return lbdm;
}
public void setLbdm(String lbdm) {
this.lbdm = lbdm;
}
public String getFzdm() {
return fzdm;
}
public void setFzdm(String fzdm) {
this.fzdm = fzdm;
}
}

View File

@ -0,0 +1,40 @@
package com.hzya.frame.grpU8.nxproof.glfzxzl.entity;
import com.hzya.frame.web.entity.BaseEntity;
import java.util.List;
public class GlFzxzlNrEntityDto extends BaseEntity {
private String gsdm;
private String kjnd;
private List<GlFzxzlNrDmEntityDto> glFzxzlNrDmEntityDtos;
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 List<GlFzxzlNrDmEntityDto> getGlFzxzlNrDmEntityDtos() {
return glFzxzlNrDmEntityDtos;
}
public void setGlFzxzlNrDmEntityDtos(List<GlFzxzlNrDmEntityDto> glFzxzlNrDmEntityDtos) {
this.glFzxzlNrDmEntityDtos = glFzxzlNrDmEntityDtos;
}
}

View File

@ -1,6 +1,7 @@
package com.hzya.frame.grpU8.nxproof.glfzxzl.service;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.basedao.service.IBaseService;
import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntity;
@ -11,4 +12,14 @@ import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntity;
* @since 2024-08-06 10:56:29
*/
public interface IGlFzxzlService extends IBaseService<GlFzxzlEntity, String> {
/**
*
* @content 查询辅助项资料
* @Param
* @Return
* @Author hecan
* @Date 2024/8/27 17:26
* **/
Object queryEntityPage(JSONObject json);
}

View File

@ -1,13 +1,19 @@
package com.hzya.frame.grpU8.nxproof.glfzxzl.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
import com.hzya.frame.basedao.service.impl.BaseService;
import com.hzya.frame.grpU8.nxproof.glfzxzl.dao.IGlFzxzlDao;
import com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntity;
import com.hzya.frame.grpU8.nxproof.glfzxzl.service.IGlFzxzlService;
import com.hzya.frame.grpU8.nxproof.pubkszl.entity.PubkszlEntity;
import com.hzya.frame.web.entity.BaseResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* (GlFzxzl)表服务实现类
*
@ -24,4 +30,30 @@ public class GlFzxzlServiceImpl extends BaseService<GlFzxzlEntity, String> imple
this.glFzxzlDao = dao;
this.dao = dao;
}
//查询辅助项资料
@Override
public Object queryEntityPage(JSONObject json) {
JSONObject jsonObject = json.getJSONObject("jsonStr");
GlFzxzlEntity glFzxzlEntity = jsonObject.toJavaObject(GlFzxzlEntity.class);
if(!checkStr(jsonObject.getString("kjnd"))){
logger.info("========查询辅助项资料传递得会计年度为空==========");
return BaseResult.getFailureMessageEntity("会计年度为空");
}
if(!checkStr(jsonObject.getString("gsdm"))){
logger.info("========查询辅助项资料传递得公司代码为空==========");
return BaseResult.getFailureMessageEntity("公司代码为空");
}
try {
List<GlFzxzlEntity> glFzxzlEntities = glFzxzlDao.queryGlFzxzlEntity(glFzxzlEntity);
PageInfo pageInfo=new PageInfo(glFzxzlEntities);
JSONObject object=new JSONObject();
object.put("pageInfo",pageInfo);
object.put("status","200");
return object;
}catch (Exception e){
logger.info("=======根据会计年度:{},公司代码:{}查询辅助项资料失败======",jsonObject.getString("kjnd"),jsonObject.getString("gsdm"),e.getMessage());
return BaseResult.getFailureMessageEntity("查询辅助项资料失败");
}
}
}

View File

@ -3,6 +3,7 @@ package com.hzya.frame.grpU8.nxproof.glkmxx.dao;
import com.hzya.frame.basedao.dao.IBaseDao;
import com.hzya.frame.grpU8.nxproof.glkmxx.entity.SenderGlKmxxEntity;
import com.hzya.frame.grpU8.nxproof.glkmxx.entity.SenderGlKmxxEntityDto;
import java.util.List;
@ -85,6 +86,15 @@ public interface ISenderGlKmxxDao extends IBaseDao<SenderGlKmxxEntity, String> {
* **/
Integer deleteGlKmxxHealthBureau(SenderGlKmxxEntity senderGlKmxxEntity);
/**
*
* @content 查询科目总账余额表数据
* @Param
* @Return
* @Author hecan
* @Date 2024/8/28 11:27
* **/
List<SenderGlKmxxEntityDto> queryAccountLedgerBalance(SenderGlKmxxEntityDto senderGlKmxxEntityDto);
}

View File

@ -6,6 +6,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
import com.hzya.frame.grpU8.nxproof.glkmxx.dao.ISenderGlKmxxDao;
import com.hzya.frame.grpU8.nxproof.glkmxx.entity.SenderGlKmxxEntity;
import com.hzya.frame.grpU8.nxproof.glkmxx.entity.SenderGlKmxxEntityDto;
import org.springframework.stereotype.Repository;
import java.util.List;
@ -61,5 +62,12 @@ public class SenderGlKmxxDaoImpl extends MybatisGenericDao<SenderGlKmxxEntity, S
public Integer deleteGlKmxxHealthBureau(SenderGlKmxxEntity senderGlKmxxEntity) {
return super.delete("SenderGlKmxxEntity_delete_kmxx",senderGlKmxxEntity);
}
//查询科目总账余额表数据
@Override
@DS("#senderGlKmxxEntityDto.dataSourceCode")
public List<SenderGlKmxxEntityDto> queryAccountLedgerBalance(SenderGlKmxxEntityDto senderGlKmxxEntityDto) {
return (List<SenderGlKmxxEntityDto>) super.selectList("queryAccountLedgerBalance",senderGlKmxxEntityDto);
}
}

View File

@ -270,6 +270,44 @@
</trim>
</select>
<!--查询科目总账余额表数据-->
<select id="queryAccountLedgerBalance" resultMap="get-SenderGlKmxxEntity-result" parameterType = "com.hzya.frame.grpU8.nxproof.glkmxx.entity.SenderGlKmxxEntityDto">
SELECT
zz.kmxz,zz.kmdm,zz.kmmc,zz.qc,zz.bqj,zz.bqd,
case when zz.yefx='J' then sum(zz.qc+zz.bqj-zz.bqd)
when zz.yefx='D' then sum(zz.qc-zz.bqj+zz.bqd)
end as qm,
zz.bqj as ljj,zz.bqd as ljd,zz.yefx
FROM
(
SELECT
km.kmxz,km.kmdm,km.kmmc,
case when km.yefx='J' then sum(ncj-ncd) when km.yefx='D' then sum(ncd-ncj) end as qc,
sum(yj1+yj2+yj3+yj4+yj5+yj6+yj7+yj8+yj9+yj10+yj11+yj12) as bqj,
sum(yd1+yd2+yd3+yd4+yd5+yd6+yd7+yd8+yd9+yd10+yd11+yd12) as bqd,
km.yefx
FROM
gl_kmxx km
LEFT JOIN GL_YEB ye ON km.kmdm = ye.kmdm
AND ye.kjnd = #{kjnd}
AND (
ye.zdylb IS NULL
OR ye.zdylb = ' '
OR ye.zdylb = '_'
)
AND yeblx = 'B' AND ye.ZTH = #{zth} AND ye.gsdm = #{gsdm}
WHERE
km.KJND = #{kjnd} AND km.ZTH = #{zth} AND km.gsdm = #{gsdm}
AND km.kmmx = '1'
<if test="kmdm != null and kmdm != ''"> and km.kmdm like concat(#{kmdm},'%') </if>
GROUP BY
km.kmdm,km.kmmc,km.kmxz,km.yefx,ye.wbdm
) zz
group by zz.kmxz,zz.kmdm,
zz.kmmc,zz.qc,zz.bqj,
zz.bqd,zz.yefx
</select>
<!--新增所有列-->
<insert id="entity_insert" parameterType = "com.hzya.frame.grpU8.nxproof.glkmxx.entity.SenderGlKmxxEntity" keyProperty="" useGeneratedKeys="true">
insert into gl_kmxx(

View File

@ -0,0 +1,58 @@
package com.hzya.frame.grpU8.nxproof.glkmxx.entity;
public class SenderGlKmxxEntityDto extends SenderGlKmxxEntity{
private String qc;//期初数据
private String bqj;//本期借方
private String bqd;//本期贷方
private String qm;//期末数据
private String ljj;//累加借方
private String ljd;//累加贷方
public String getQc() {
return qc;
}
public void setQc(String qc) {
this.qc = qc;
}
public String getBqj() {
return bqj;
}
public void setBqj(String bqj) {
this.bqj = bqj;
}
public String getBqd() {
return bqd;
}
public void setBqd(String bqd) {
this.bqd = bqd;
}
public String getQm() {
return qm;
}
public void setQm(String qm) {
this.qm = qm;
}
public String getLjj() {
return ljj;
}
public void setLjj(String ljj) {
this.ljj = ljj;
}
public String getLjd() {
return ljd;
}
public void setLjd(String ljd) {
this.ljd = ljd;
}
}

View File

@ -88,5 +88,15 @@ public interface ISenderGlKmxxService extends IBaseService<SenderGlKmxxEntity, S
* **/
SysExtensionApiEntity getDataSourceCode(SysExtensionApiEntity sysExtensionApiEntity);
/**
*
* @content 查询科目总账余额表数据
* @Param
* @Return
* @Author hecan
* @Date 2024/8/28 11:36
* **/
Object queryKmxxLedgerBalance(JSONObject json);
}

View File

@ -9,6 +9,7 @@ import com.github.pagehelper.PageInfo;
import com.hzya.frame.basedao.service.impl.BaseService;
import com.hzya.frame.grpU8.nxproof.glkmxx.dao.ISenderGlKmxxDao;
import com.hzya.frame.grpU8.nxproof.glkmxx.entity.SenderGlKmxxEntity;
import com.hzya.frame.grpU8.nxproof.glkmxx.entity.SenderGlKmxxEntityDto;
import com.hzya.frame.grpU8.nxproof.glkmxx.service.ISenderGlKmxxService;
import com.hzya.frame.sysnew.application.database.dao.ISysApplicationDatabaseDao;
import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
@ -466,4 +467,35 @@ public class SenderGlKmxxServiceImpl extends BaseService<SenderGlKmxxEntity, Str
}
return entity;
}
//查询科目总账余额信息
@Override
public Object queryKmxxLedgerBalance(JSONObject json) {
JSONObject jsonObject = json.getJSONObject("jsonStr");
SenderGlKmxxEntityDto receiverGlKmxxEntityDto = jsonObject.toJavaObject(SenderGlKmxxEntityDto.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("=======开始根据账套号:{},公司代码:{},科目代码:{},会计年度:{}查询科目总账余额数据========",receiverGlKmxxEntityDto.getZth(),receiverGlKmxxEntityDto.getGsdm(),receiverGlKmxxEntityDto.getKmdm(),receiverGlKmxxEntityDto.getKjnd());
List<SenderGlKmxxEntityDto> senderGlKmxxEntityDtos = senderGlKmxxDao.queryAccountLedgerBalance(receiverGlKmxxEntityDto);
PageInfo pageInfo=new PageInfo(senderGlKmxxEntityDtos);
JSONObject object=new JSONObject();
object.put("pageInfo",pageInfo);
object.put("status","200");
return object;
}catch (Exception e){
logger.info("根据账套号:{}和科目代码:{}以及会计年度:{}查询科目总账余额信息失败:{}", receiverGlKmxxEntityDto.getZth(), receiverGlKmxxEntityDto.getKmdm(), receiverGlKmxxEntityDto.getKjnd(), e.getMessage());
return BaseResult.getFailureMessageEntity("查询科目总账余额失败");
}
}
}

View File

@ -0,0 +1,19 @@
package com.hzya.frame.grpU8.nxproof.glxjllxm.dao;
import com.hzya.frame.grpU8.nxproof.glxjllxm.entity.GlXjllxmEntity;
import com.hzya.frame.basedao.dao.IBaseDao;
import java.util.List;
/**
* (GL_Xjllxm: table)表数据库访问层
*
* @author makejava
* @since 2024-08-27 15:58:37
*/
public interface IGlXjllxmDao extends IBaseDao<GlXjllxmEntity, String> {
//查询现金流量数据
List<GlXjllxmEntity> queryGlXjllxmEntity(GlXjllxmEntity glXjllxmEntity);
}

View File

@ -0,0 +1,26 @@
package com.hzya.frame.grpU8.nxproof.glxjllxm.dao.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.hzya.frame.grpU8.nxproof.glxjllxm.entity.GlXjllxmEntity;
import com.hzya.frame.grpU8.nxproof.glxjllxm.dao.IGlXjllxmDao;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
import java.util.List;
/**
* (GlXjllxm)表数据库访问层
*
* @author makejava
* @since 2024-08-27 15:58:37
*/
@Repository(value = "GlXjllxmDaoImpl")
public class GlXjllxmDaoImpl extends MybatisGenericDao<GlXjllxmEntity, String> implements IGlXjllxmDao{
@DS("#glXjllxmEntity.dataSourceCode")
@Override
public List<GlXjllxmEntity> queryGlXjllxmEntity(GlXjllxmEntity glXjllxmEntity) {
return super.queryByLike(glXjllxmEntity);
}
}

View File

@ -0,0 +1,150 @@
package com.hzya.frame.grpU8.nxproof.glxjllxm.entity;
import com.hzya.frame.web.entity.BaseEntity;
/**
* (GlXjllxm)实体类
*现金流量项目表
* @author makejava
* @since 2024-08-27 15:58:37
*/
public class GlXjllxmEntity extends BaseEntity {
private String gsdm;
private String zth;
private String kjnd;
private String xjdm;
private String xjmc;
private String zjm;
private String xjlx;
private String syzt;
private String bz;
private Integer jlrId;
private String jlRq;
private Integer xgrId;
private String xgRq;
private String sjly;
private String sfmx;
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 getKjnd() {
return kjnd;
}
public void setKjnd(String kjnd) {
this.kjnd = kjnd;
}
public String getXjdm() {
return xjdm;
}
public void setXjdm(String xjdm) {
this.xjdm = xjdm;
}
public String getXjmc() {
return xjmc;
}
public void setXjmc(String xjmc) {
this.xjmc = xjmc;
}
public String getZjm() {
return zjm;
}
public void setZjm(String zjm) {
this.zjm = zjm;
}
public String getXjlx() {
return xjlx;
}
public void setXjlx(String xjlx) {
this.xjlx = xjlx;
}
public String getSyzt() {
return syzt;
}
public void setSyzt(String syzt) {
this.syzt = syzt;
}
public String getBz() {
return bz;
}
public void setBz(String bz) {
this.bz = bz;
}
public Integer getJlrId() {
return jlrId;
}
public void setJlrId(Integer jlrId) {
this.jlrId = jlrId;
}
public String getJlRq() {
return jlRq;
}
public void setJlRq(String jlRq) {
this.jlRq = jlRq;
}
public Integer getXgrId() {
return xgrId;
}
public void setXgrId(Integer xgrId) {
this.xgrId = xgrId;
}
public String getXgRq() {
return xgRq;
}
public void setXgRq(String xgRq) {
this.xgRq = xgRq;
}
public String getSjly() {
return sjly;
}
public void setSjly(String sjly) {
this.sjly = sjly;
}
public String getSfmx() {
return sfmx;
}
public void setSfmx(String sfmx) {
this.sfmx = sfmx;
}
}

View File

@ -0,0 +1,252 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.grpU8.nxproof.glxjllxm.dao.impl.GlXjllxmDaoImpl">
<resultMap id="get-GlXjllxmEntity-result" type="com.hzya.frame.grpU8.nxproof.glxjllxm.entity.GlXjllxmEntity" >
<result property="gsdm" column="gsdm" jdbcType="VARCHAR"/>
<result property="zth" column="ZTH" jdbcType="VARCHAR"/>
<result property="kjnd" column="kjnd" jdbcType="VARCHAR"/>
<result property="xjdm" column="xjdm" jdbcType="VARCHAR"/>
<result property="xjmc" column="xjmc" jdbcType="VARCHAR"/>
<result property="zjm" column="zjm" jdbcType="VARCHAR"/>
<result property="xjlx" column="xjlx" jdbcType="VARCHAR"/>
<result property="syzt" column="syzt" jdbcType="VARCHAR"/>
<result property="bz" column="bz" jdbcType="VARCHAR"/>
<result property="jlrId" column="Jlr_ID" jdbcType="INTEGER"/>
<result property="jlRq" column="Jl_RQ" jdbcType="VARCHAR"/>
<result property="xgrId" column="Xgr_ID" jdbcType="INTEGER"/>
<result property="xgRq" column="Xg_RQ" jdbcType="VARCHAR"/>
<result property="sjly" column="Sjly" jdbcType="VARCHAR"/>
<result property="sfmx" column="sfmx" jdbcType="VARCHAR"/>
</resultMap>
<!-- 查询的字段-->
<sql id = "GlXjllxmEntity_Base_Column_List">
gsdm
,ZTH
,kjnd
,xjdm
,xjmc
,zjm
,xjlx
,syzt
,bz
,Jlr_ID
,Jl_RQ
,Xgr_ID
,Xg_RQ
,Sjly
,sfmx
</sql>
<!-- 查询 采用==查询 -->
<select id="entity_list_base" resultMap="get-GlXjllxmEntity-result" parameterType = "com.hzya.frame.grpU8.nxproof.glxjllxm.entity.GlXjllxmEntity">
select
<include refid="GlXjllxmEntity_Base_Column_List" />
from GL_Xjllxm
<trim prefix="where" prefixOverrides="and">
<if test="gsdm != null and gsdm != ''"> and gsdm = #{gsdm} </if>
<if test="zth != null and zth != ''"> and ZTH = #{zth} </if>
<if test="kjnd != null and kjnd != ''"> and kjnd = #{kjnd} </if>
<if test="xjdm != null and xjdm != ''"> and xjdm = #{xjdm} </if>
<if test="xjmc != null and xjmc != ''"> and xjmc = #{xjmc} </if>
<if test="zjm != null and zjm != ''"> and zjm = #{zjm} </if>
<if test="xjlx != null and xjlx != ''"> and xjlx = #{xjlx} </if>
<if test="syzt != null and syzt != ''"> and syzt = #{syzt} </if>
<if test="bz != null and bz != ''"> and bz = #{bz} </if>
<if test="jlrId != null"> and Jlr_ID = #{jlrId} </if>
<if test="jlRq != null and jlRq != ''"> and Jl_RQ = #{jlRq} </if>
<if test="xgrId != null"> and Xgr_ID = #{xgrId} </if>
<if test="xgRq != null and xgRq != ''"> and Xg_RQ = #{xgRq} </if>
<if test="sjly != null and sjly != ''"> and Sjly = #{sjly} </if>
<if test="sfmx != null and sfmx != ''"> and sfmx = #{sfmx} </if>
</trim>
</select>
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.grpU8.nxproof.glxjllxm.entity.GlXjllxmEntity">
select count(1) from GL_Xjllxm
<trim prefix="where" prefixOverrides="and">
<if test="gsdm != null and gsdm != ''"> and gsdm = #{gsdm} </if>
<if test="zth != null and zth != ''"> and ZTH = #{zth} </if>
<if test="kjnd != null and kjnd != ''"> and kjnd = #{kjnd} </if>
<if test="xjdm != null and xjdm != ''"> and xjdm = #{xjdm} </if>
<if test="xjmc != null and xjmc != ''"> and xjmc = #{xjmc} </if>
<if test="zjm != null and zjm != ''"> and zjm = #{zjm} </if>
<if test="xjlx != null and xjlx != ''"> and xjlx = #{xjlx} </if>
<if test="syzt != null and syzt != ''"> and syzt = #{syzt} </if>
<if test="bz != null and bz != ''"> and bz = #{bz} </if>
<if test="jlrId != null"> and Jlr_ID = #{jlrId} </if>
<if test="jlRq != null and jlRq != ''"> and Jl_RQ = #{jlRq} </if>
<if test="xgrId != null"> and Xgr_ID = #{xgrId} </if>
<if test="xgRq != null and xgRq != ''"> and Xg_RQ = #{xgRq} </if>
<if test="sjly != null and sjly != ''"> and Sjly = #{sjly} </if>
<if test="sfmx != null and sfmx != ''"> and sfmx = #{sfmx} </if>
</trim>
</select>
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-GlXjllxmEntity-result" parameterType = "com.hzya.frame.grpU8.nxproof.glxjllxm.entity.GlXjllxmEntity">
select
<include refid="GlXjllxmEntity_Base_Column_List" />
from GL_Xjllxm
<trim prefix="where" prefixOverrides="and">
<if test="gsdm != null and gsdm != ''"> and gsdm like concat('%',#{gsdm},'%') </if>
<if test="zth != null and zth != ''"> and ZTH like concat('%',#{zth},'%') </if>
<if test="kjnd != null and kjnd != ''"> and kjnd like concat('%',#{kjnd},'%') </if>
<if test="xjdm != null and xjdm != ''"> and xjdm like concat('%',#{xjdm},'%') </if>
<if test="xjmc != null and xjmc != ''"> and xjmc like concat('%',#{xjmc},'%') </if>
<if test="zjm != null and zjm != ''"> and zjm like concat('%',#{zjm},'%') </if>
<if test="xjlx != null and xjlx != ''"> and xjlx like concat('%',#{xjlx},'%') </if>
<if test="syzt != null and syzt != ''"> and syzt like concat('%',#{syzt},'%') </if>
<if test="bz != null and bz != ''"> and bz like concat('%',#{bz},'%') </if>
<if test="jlrId != null"> and Jlr_ID like concat('%',#{jlrId},'%') </if>
<if test="jlRq != null and jlRq != ''"> and Jl_RQ like concat('%',#{jlRq},'%') </if>
<if test="xgrId != null"> and Xgr_ID like concat('%',#{xgrId},'%') </if>
<if test="xgRq != null and xgRq != ''"> and Xg_RQ like concat('%',#{xgRq},'%') </if>
<if test="sjly != null and sjly != ''"> and Sjly like concat('%',#{sjly},'%') </if>
<if test="sfmx != null and sfmx != ''"> and sfmx like concat('%',#{sfmx},'%') </if>
</trim>
</select>
<!-- 查询列表 字段采用or格式 -->
<select id="GlXjllxmentity_list_or" resultMap="get-GlXjllxmEntity-result" parameterType = "com.hzya.frame.grpU8.nxproof.glxjllxm.entity.GlXjllxmEntity">
select
<include refid="GlXjllxmEntity_Base_Column_List" />
from GL_Xjllxm
<trim prefix="where" prefixOverrides="and">
<if test="gsdm != null and gsdm != ''"> or gsdm = #{gsdm} </if>
<if test="zth != null and zth != ''"> or ZTH = #{zth} </if>
<if test="kjnd != null and kjnd != ''"> or kjnd = #{kjnd} </if>
<if test="xjdm != null and xjdm != ''"> or xjdm = #{xjdm} </if>
<if test="xjmc != null and xjmc != ''"> or xjmc = #{xjmc} </if>
<if test="zjm != null and zjm != ''"> or zjm = #{zjm} </if>
<if test="xjlx != null and xjlx != ''"> or xjlx = #{xjlx} </if>
<if test="syzt != null and syzt != ''"> or syzt = #{syzt} </if>
<if test="bz != null and bz != ''"> or bz = #{bz} </if>
<if test="jlrId != null"> or Jlr_ID = #{jlrId} </if>
<if test="jlRq != null and jlRq != ''"> or Jl_RQ = #{jlRq} </if>
<if test="xgrId != null"> or Xgr_ID = #{xgrId} </if>
<if test="xgRq != null and xgRq != ''"> or Xg_RQ = #{xgRq} </if>
<if test="sjly != null and sjly != ''"> or Sjly = #{sjly} </if>
<if test="sfmx != null and sfmx != ''"> or sfmx = #{sfmx} </if>
</trim>
</select>
<!--新增所有列-->
<insert id="entity_insert" parameterType = "com.hzya.frame.grpU8.nxproof.glxjllxm.entity.GlXjllxmEntity" keyProperty="gsdm" useGeneratedKeys="true">
insert into GL_Xjllxm(
<trim suffix="" suffixOverrides=",">
<if test="gsdm != null and gsdm != ''"> gsdm , </if>
<if test="zth != null and zth != ''"> ZTH , </if>
<if test="kjnd != null and kjnd != ''"> kjnd , </if>
<if test="xjdm != null and xjdm != ''"> xjdm , </if>
<if test="xjmc != null and xjmc != ''"> xjmc , </if>
<if test="zjm != null and zjm != ''"> zjm , </if>
<if test="xjlx != null and xjlx != ''"> xjlx , </if>
<if test="syzt != null and syzt != ''"> syzt , </if>
<if test="bz != null and bz != ''"> bz , </if>
<if test="jlrId != null"> Jlr_ID , </if>
<if test="jlRq != null and jlRq != ''"> Jl_RQ , </if>
<if test="xgrId != null"> Xgr_ID , </if>
<if test="xgRq != null and xgRq != ''"> Xg_RQ , </if>
<if test="sjly != null and sjly != ''"> Sjly , </if>
<if test="sfmx != null and sfmx != ''"> sfmx , </if>
</trim>
)values(
<trim suffix="" suffixOverrides=",">
<if test="gsdm != null and gsdm != ''"> #{gsdm} ,</if>
<if test="zth != null and zth != ''"> #{zth} ,</if>
<if test="kjnd != null and kjnd != ''"> #{kjnd} ,</if>
<if test="xjdm != null and xjdm != ''"> #{xjdm} ,</if>
<if test="xjmc != null and xjmc != ''"> #{xjmc} ,</if>
<if test="zjm != null and zjm != ''"> #{zjm} ,</if>
<if test="xjlx != null and xjlx != ''"> #{xjlx} ,</if>
<if test="syzt != null and syzt != ''"> #{syzt} ,</if>
<if test="bz != null and bz != ''"> #{bz} ,</if>
<if test="jlrId != null"> #{jlrId} ,</if>
<if test="jlRq != null and jlRq != ''"> #{jlRq} ,</if>
<if test="xgrId != null"> #{xgrId} ,</if>
<if test="xgRq != null and xgRq != ''"> #{xgRq} ,</if>
<if test="sjly != null and sjly != ''"> #{sjly} ,</if>
<if test="sfmx != null and sfmx != ''"> #{sfmx} ,</if>
</trim>
)
</insert>
<!-- 批量新增 -->
<insert id="entityInsertBatch" keyProperty="gsdm" useGeneratedKeys="true">
insert into GL_Xjllxm(xjmc, zjm, xjlx, syzt, bz, Jlr_ID, Jl_RQ, Xgr_ID, Xg_RQ, Sjly, sfmx, sts)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.xjmc},#{entity.zjm},#{entity.xjlx},#{entity.syzt},#{entity.bz},#{entity.jlrId},#{entity.jlRq},#{entity.xgrId},#{entity.xgRq},#{entity.sjly},#{entity.sfmx}, 'Y')
</foreach>
</insert>
<!-- 批量新增或者修改-->
<insert id="entityInsertOrUpdateBatch" keyProperty="gsdm" useGeneratedKeys="true">
insert into GL_Xjllxm(xjmc, zjm, xjlx, syzt, bz, Jlr_ID, Jl_RQ, Xgr_ID, Xg_RQ, Sjly, sfmx)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.xjmc},#{entity.zjm},#{entity.xjlx},#{entity.syzt},#{entity.bz},#{entity.jlrId},#{entity.jlRq},#{entity.xgrId},#{entity.xgRq},#{entity.sjly},#{entity.sfmx})
</foreach>
on duplicate key update
xjmc = values(xjmc),
zjm = values(zjm),
xjlx = values(xjlx),
syzt = values(syzt),
bz = values(bz),
Jlr_ID = values(Jlr_ID),
Jl_RQ = values(Jl_RQ),
Xgr_ID = values(Xgr_ID),
Xg_RQ = values(Xg_RQ),
Sjly = values(Sjly),
sfmx = values(sfmx)</insert>
<!--通过主键修改方法-->
<update id="entity_update" parameterType = "com.hzya.frame.grpU8.nxproof.glxjllxm.entity.GlXjllxmEntity" >
update GL_Xjllxm set
<trim suffix="" suffixOverrides=",">
<if test="xjmc != null and xjmc != ''"> xjmc = #{xjmc},</if>
<if test="zjm != null and zjm != ''"> zjm = #{zjm},</if>
<if test="xjlx != null and xjlx != ''"> xjlx = #{xjlx},</if>
<if test="syzt != null and syzt != ''"> syzt = #{syzt},</if>
<if test="bz != null and bz != ''"> bz = #{bz},</if>
<if test="jlrId != null"> Jlr_ID = #{jlrId},</if>
<if test="jlRq != null and jlRq != ''"> Jl_RQ = #{jlRq},</if>
<if test="xgrId != null"> Xgr_ID = #{xgrId},</if>
<if test="xgRq != null and xgRq != ''"> Xg_RQ = #{xgRq},</if>
<if test="sjly != null and sjly != ''"> Sjly = #{sjly},</if>
<if test="sfmx != null and sfmx != ''"> sfmx = #{sfmx},</if>
</trim>
where gsdm = #{gsdm}
</update>
<!-- 逻辑删除 -->
<update id="entity_logicDelete" parameterType = "com.hzya.frame.grpU8.nxproof.glxjllxm.entity.GlXjllxmEntity" >
update GL_Xjllxm set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
where gsdm = #{gsdm}
</update>
<!-- 多条件逻辑删除 -->
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.grpU8.nxproof.glxjllxm.entity.GlXjllxmEntity" >
update GL_Xjllxm set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
<trim prefix="where" prefixOverrides="and">
<if test="gsdm != null and gsdm != ''"> and gsdm = #{gsdm} </if>
<if test="zth != null and zth != ''"> and ZTH = #{zth} </if>
<if test="kjnd != null and kjnd != ''"> and kjnd = #{kjnd} </if>
<if test="xjdm != null and xjdm != ''"> and xjdm = #{xjdm} </if>
<if test="xjmc != null and xjmc != ''"> and xjmc = #{xjmc} </if>
<if test="zjm != null and zjm != ''"> and zjm = #{zjm} </if>
<if test="xjlx != null and xjlx != ''"> and xjlx = #{xjlx} </if>
<if test="syzt != null and syzt != ''"> and syzt = #{syzt} </if>
<if test="bz != null and bz != ''"> and bz = #{bz} </if>
<if test="jlrId != null"> and Jlr_ID = #{jlrId} </if>
<if test="jlRq != null and jlRq != ''"> and Jl_RQ = #{jlRq} </if>
<if test="xgrId != null"> and Xgr_ID = #{xgrId} </if>
<if test="xgRq != null and xgRq != ''"> and Xg_RQ = #{xgRq} </if>
<if test="sjly != null and sjly != ''"> and Sjly = #{sjly} </if>
<if test="sfmx != null and sfmx != ''"> and sfmx = #{sfmx} </if>
and sts='Y'
</trim>
</update>
<!--通过主键删除-->
<delete id="entity_delete">
delete from GL_Xjllxm where gsdm = #{gsdm}
</delete>
</mapper>

View File

@ -0,0 +1,23 @@
package com.hzya.frame.grpU8.nxproof.glxjllxm.service;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.grpU8.nxproof.glxjllxm.entity.GlXjllxmEntity;
import com.hzya.frame.basedao.service.IBaseService;
/**
* (GlXjllxm)表服务接口
*
* @author makejava
* @since 2024-08-27 15:58:38
*/
public interface IGlXjllxmService extends IBaseService<GlXjllxmEntity, String>{
/**
*
* @content 分页查询现金流量项目数据
* @Param
* @Return
* @Author hecan
* @Date 2024/8/27 16:07
* **/
Object queryEntityPage(JSONObject json);
}

View File

@ -0,0 +1,58 @@
package com.hzya.frame.grpU8.nxproof.glxjllxm.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
import com.hzya.frame.grpU8.nxproof.glxjllxm.entity.GlXjllxmEntity;
import com.hzya.frame.grpU8.nxproof.glxjllxm.dao.IGlXjllxmDao;
import com.hzya.frame.grpU8.nxproof.glxjllxm.service.IGlXjllxmService;
import com.hzya.frame.web.entity.BaseResult;
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;
/**
* (GlXjllxm)表服务实现类
*
* @author makejava
* @since 2024-08-27 15:58:38
*/
@Service(value = "GlXjllxmServiceImpl")
public class GlXjllxmServiceImpl extends BaseService<GlXjllxmEntity, String> implements IGlXjllxmService {
private IGlXjllxmDao glXjllxmDao;
@Autowired
public void setGlXjllxmDao(IGlXjllxmDao dao) {
this.glXjllxmDao = dao;
this.dao = dao;
}
//分页查询现金流量项目数据
@Override
public Object queryEntityPage(JSONObject json) {
JSONObject jsonObject = json.getJSONObject("jsonStr");
GlXjllxmEntity glXjllxmEntity = jsonObject.toJavaObject(GlXjllxmEntity.class);
if(!checkStr(jsonObject.getString("kjnd"))){
logger.info("========查询现金流量项目数据传递得会计年度为空==========");
return BaseResult.getFailureMessageEntity("会计年度为空");
}
if(!checkStr(jsonObject.getString("gsdm"))){
logger.info("========查询现金流量项目数据传递得公司代码为空==========");
return BaseResult.getFailureMessageEntity("公司代码为空");
}
try {
List<GlXjllxmEntity> glXjllxmEntities = glXjllxmDao.queryGlXjllxmEntity(glXjllxmEntity);
PageInfo pageInfo=new PageInfo(glXjllxmEntities);
JSONObject object=new JSONObject();
object.put("pageInfo",pageInfo);
object.put("status","200");
return object;
}catch (Exception e){
logger.info("=======根据会计年度:{},公司代码:{}查询现金流量项目失败======",jsonObject.getString("kjnd"),jsonObject.getString("gsdm"),e.getMessage());
return BaseResult.getFailureMessageEntity("查询现金流量项目失败");
}
}
}

View File

@ -339,7 +339,20 @@ public class SenderPubbmxxServiceImpl extends BaseService<SenderPubbmxxEntity, S
senderPubbmxxEntity.setBmdm(receiverPubbmxxEntity.getBmdm());
senderPubbmxxEntity.setDataSourceCode(receiverPubbmxxEntity.getDataSourceCode());
List<SenderPubbmxxEntity> senderPubbmxxEntities = queryEntityPageHealthBureau(senderPubbmxxEntity);
if(CollectionUtils.isEmpty(senderPubbmxxEntities)){
if(CollectionUtils.isNotEmpty(senderPubbmxxEntities)){
logger.info("====根据公司编码:{},会计年度:{},部门代码:{}查询数据有{}条",receiverPubbmxxEntity.getGsdm(),receiverPubbmxxEntity.getKjnd(),receiverPubbmxxEntity.getBmdm(),senderPubbmxxEntities.size());
logger.info("部门代码:{}在公司代码为:{}和会计年度为{}中已经存在",receiverPubbmxxEntity.getBmdm(),receiverPubbmxxEntity.getGsdm(),receiverPubbmxxEntity.getKjnd());
return BaseResult.getFailureMessageEntity("该部门编码已经存在,不保存");
}else{
receiverPubbmxxEntity.setId(receiverPubbmxxEntity.getGsdm()+'-'+receiverPubbmxxEntity.getKjnd()+'-'+receiverPubbmxxEntity.getBmdm());
logger.info("==========开始保存公司编码为:{}得部门信息id为:{}=========",receiverPubbmxxEntity.getGsdm(),receiverPubbmxxEntity.getId());
SenderPubbmxxEntity receiverPubbmxxEntity1 = senderPubbmxxDao.savePubbmxxHealthBureau(receiverPubbmxxEntity);
JSONObject jsonObject1=new JSONObject();
jsonObject1.put("status","200");
jsonObject1.put("bmxx",receiverPubbmxxEntity1);
return jsonObject1;
}
/*if(CollectionUtils.isEmpty(senderPubbmxxEntities)){
receiverPubbmxxEntity.setId(receiverPubbmxxEntity.getGsdm()+'-'+receiverPubbmxxEntity.getKjnd()+'-'+receiverPubbmxxEntity.getBmdm());
logger.info("==========开始保存公司编码为:{}得部门信息id为:{}=========",receiverPubbmxxEntity.getGsdm(),receiverPubbmxxEntity.getId());
SenderPubbmxxEntity receiverPubbmxxEntity1 = senderPubbmxxDao.savePubbmxxHealthBureau(receiverPubbmxxEntity);
@ -354,7 +367,7 @@ public class SenderPubbmxxServiceImpl extends BaseService<SenderPubbmxxEntity, S
jsonObject1.put("status","200");
jsonObject1.put("bmxx",receiverPubbmxxEntity1);
return jsonObject1;
}
}*/
}catch (Exception e){
logger.info("保存公司编码为:{}得GROU8部门信息失败:{}",receiverPubbmxxEntity.getGsdm(),e.getMessage());
return BaseResult.getFailureMessageEntity("保存GROU8部门信息失败");

View File

@ -0,0 +1,29 @@
package com.hzya.frame.grpU8.nxproof.pubkszl.dao;
import com.hzya.frame.grpU8.nxproof.pubkszl.entity.PubkszlEntity;
import com.hzya.frame.basedao.dao.IBaseDao;
import java.util.List;
/**
* (PUBKSZL: table)表数据库访问层
*
* @author makejava
* @since 2024-08-27 15:56:53
*/
public interface IPubkszlDao extends IBaseDao<PubkszlEntity, String> {
//查询往来单位数据
List<PubkszlEntity> queryPubkszlEntity(PubkszlEntity pubkszlEntity);
//新增往来单位数据
PubkszlEntity savePubkszlEntity(PubkszlEntity pubkszlEntity);
//修改往来单位数据
PubkszlEntity updatePubkszlEntity(PubkszlEntity pubkszlEntity);
//删除往来单位数据
Integer deletePubkszlEntity(PubkszlEntity pubkszlEntity);
}

View File

@ -0,0 +1,44 @@
package com.hzya.frame.grpU8.nxproof.pubkszl.dao.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.hzya.frame.grpU8.nxproof.pubkszl.entity.PubkszlEntity;
import com.hzya.frame.grpU8.nxproof.pubkszl.dao.IPubkszlDao;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
import java.util.List;
/**
* (Pubkszl)表数据库访问层
*
* @author makejava
* @since 2024-08-27 15:56:53
*/
@Repository(value = "PubkszlDaoImpl")
public class PubkszlDaoImpl extends MybatisGenericDao<PubkszlEntity, String> implements IPubkszlDao{
@DS("#pubkszlEntity.dataSourceCode")
@Override
public List<PubkszlEntity> queryPubkszlEntity(PubkszlEntity pubkszlEntity) {
return super.queryByLike(pubkszlEntity);
}
@DS("#pubkszlEntity.dataSourceCode")
@Override
public PubkszlEntity savePubkszlEntity(PubkszlEntity pubkszlEntity) {
return super.save(pubkszlEntity);
}
@DS("#pubkszlEntity.dataSourceCode")
@Override
public PubkszlEntity updatePubkszlEntity(PubkszlEntity pubkszlEntity) {
return super.update(pubkszlEntity);
}
@DS("#pubkszlEntity.dataSourceCode")
@Override
public Integer deletePubkszlEntity(PubkszlEntity pubkszlEntity) {
return super.delete("PubkszlEntity_delete_kszl",pubkszlEntity);
}
}

View File

@ -0,0 +1,834 @@
package com.hzya.frame.grpU8.nxproof.pubkszl.entity;
import com.hzya.frame.web.entity.BaseEntity;
/**
* (Pubkszl)实体类
*往来单位(客商资料)
* @author makejava
* @since 2024-08-27 15:56:53
*/
public class PubkszlEntity extends BaseEntity {
private String gsdm;
private String kjnd;
private String dwdm;
private String dwmc;
private String jym;
private String dwqc;
private String dqdm;
private String txdz;
private String yb;
private String lxrxm;
private String tel;
private String fax;
private String email;
private String http;
private String sjdwdm;
private String zzsh;
private String yyzh;
private String frdbxm;
private String jyfw;
private String khyh;
private String zh;
private String yszkkmdm;
private String yfzkkmdm;
private String dwwb;
private String bizh;
private Integer xyts;
private Integer xyed;
private String sftzjy;
private String sfxykz;
private String sfkh;
private String sfcj;
private String sfgys;
private String sfjtndw;
private String syzt;
private String bz;
private Integer jlrId;
private String jlRq;
private Integer xgrId;
private String xgRq;
private String sjly;
private String dyzwzth;
private String dyzwztmc;
private String dysjk;
private String dyzwztckkm;
private String dyckkm;
private String dyckzh;
private String dyyhckzh;
private String dyyhxjzh;
private String bzly;
private String bzsyzt;
private String bzbz1;
private String bzbz2;
private String bzbz3;
private String bzbz4;
private String bzbz5;
private String bzbz6;
private String bzbz7;
private String sfysdw;
private String dwxz;
private String sh;
private String dwfzr;
private String cwfzr;
private String dwjbr;
private String dwgbm;
private String sfmx;
private String yhbm;
private String mqkpbz;
private String hkfs;
private String pjmaxsl;
private String dwjb;
private String gkjzzf;
private String webmemberid;
private String sjlbdm;
private String bemDwjb;
private String yuszkkmdm;
private String yufzkkmdm;
private String maxrsqje;
private String maxdjsqje;
private String maxsqjebl;
private String unittype;
private String zjyhdm;
private String zjyhmc;
private String sqyhdm;
private String sqyhmc;
private String yqguid;
private String nsrsbh;
private String orgcode;
private String dwsx;
private String dycwckkm;
private String wbdwdm;
private String wbdwmc;
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 getDwdm() {
return dwdm;
}
public void setDwdm(String dwdm) {
this.dwdm = dwdm;
}
public String getDwmc() {
return dwmc;
}
public void setDwmc(String dwmc) {
this.dwmc = dwmc;
}
public String getJym() {
return jym;
}
public void setJym(String jym) {
this.jym = jym;
}
public String getDwqc() {
return dwqc;
}
public void setDwqc(String dwqc) {
this.dwqc = dwqc;
}
public String getDqdm() {
return dqdm;
}
public void setDqdm(String dqdm) {
this.dqdm = dqdm;
}
public String getTxdz() {
return txdz;
}
public void setTxdz(String txdz) {
this.txdz = txdz;
}
public String getYb() {
return yb;
}
public void setYb(String yb) {
this.yb = yb;
}
public String getLxrxm() {
return lxrxm;
}
public void setLxrxm(String lxrxm) {
this.lxrxm = lxrxm;
}
public String getTel() {
return tel;
}
public void setTel(String tel) {
this.tel = tel;
}
public String getFax() {
return fax;
}
public void setFax(String fax) {
this.fax = fax;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getHttp() {
return http;
}
public void setHttp(String http) {
this.http = http;
}
public String getSjdwdm() {
return sjdwdm;
}
public void setSjdwdm(String sjdwdm) {
this.sjdwdm = sjdwdm;
}
public String getZzsh() {
return zzsh;
}
public void setZzsh(String zzsh) {
this.zzsh = zzsh;
}
public String getYyzh() {
return yyzh;
}
public void setYyzh(String yyzh) {
this.yyzh = yyzh;
}
public String getFrdbxm() {
return frdbxm;
}
public void setFrdbxm(String frdbxm) {
this.frdbxm = frdbxm;
}
public String getJyfw() {
return jyfw;
}
public void setJyfw(String jyfw) {
this.jyfw = jyfw;
}
public String getKhyh() {
return khyh;
}
public void setKhyh(String khyh) {
this.khyh = khyh;
}
public String getZh() {
return zh;
}
public void setZh(String zh) {
this.zh = zh;
}
public String getYszkkmdm() {
return yszkkmdm;
}
public void setYszkkmdm(String yszkkmdm) {
this.yszkkmdm = yszkkmdm;
}
public String getYfzkkmdm() {
return yfzkkmdm;
}
public void setYfzkkmdm(String yfzkkmdm) {
this.yfzkkmdm = yfzkkmdm;
}
public String getDwwb() {
return dwwb;
}
public void setDwwb(String dwwb) {
this.dwwb = dwwb;
}
public String getBizh() {
return bizh;
}
public void setBizh(String bizh) {
this.bizh = bizh;
}
public Integer getXyts() {
return xyts;
}
public void setXyts(Integer xyts) {
this.xyts = xyts;
}
public Integer getXyed() {
return xyed;
}
public void setXyed(Integer xyed) {
this.xyed = xyed;
}
public String getSftzjy() {
return sftzjy;
}
public void setSftzjy(String sftzjy) {
this.sftzjy = sftzjy;
}
public String getSfxykz() {
return sfxykz;
}
public void setSfxykz(String sfxykz) {
this.sfxykz = sfxykz;
}
public String getSfkh() {
return sfkh;
}
public void setSfkh(String sfkh) {
this.sfkh = sfkh;
}
public String getSfcj() {
return sfcj;
}
public void setSfcj(String sfcj) {
this.sfcj = sfcj;
}
public String getSfgys() {
return sfgys;
}
public void setSfgys(String sfgys) {
this.sfgys = sfgys;
}
public String getSfjtndw() {
return sfjtndw;
}
public void setSfjtndw(String sfjtndw) {
this.sfjtndw = sfjtndw;
}
public String getSyzt() {
return syzt;
}
public void setSyzt(String syzt) {
this.syzt = syzt;
}
public String getBz() {
return bz;
}
public void setBz(String bz) {
this.bz = bz;
}
public Integer getJlrId() {
return jlrId;
}
public void setJlrId(Integer jlrId) {
this.jlrId = jlrId;
}
public String getJlRq() {
return jlRq;
}
public void setJlRq(String jlRq) {
this.jlRq = jlRq;
}
public Integer getXgrId() {
return xgrId;
}
public void setXgrId(Integer xgrId) {
this.xgrId = xgrId;
}
public String getXgRq() {
return xgRq;
}
public void setXgRq(String xgRq) {
this.xgRq = xgRq;
}
public String getSjly() {
return sjly;
}
public void setSjly(String sjly) {
this.sjly = sjly;
}
public String getDyzwzth() {
return dyzwzth;
}
public void setDyzwzth(String dyzwzth) {
this.dyzwzth = dyzwzth;
}
public String getDyzwztmc() {
return dyzwztmc;
}
public void setDyzwztmc(String dyzwztmc) {
this.dyzwztmc = dyzwztmc;
}
public String getDysjk() {
return dysjk;
}
public void setDysjk(String dysjk) {
this.dysjk = dysjk;
}
public String getDyzwztckkm() {
return dyzwztckkm;
}
public void setDyzwztckkm(String dyzwztckkm) {
this.dyzwztckkm = dyzwztckkm;
}
public String getDyckkm() {
return dyckkm;
}
public void setDyckkm(String dyckkm) {
this.dyckkm = dyckkm;
}
public String getDyckzh() {
return dyckzh;
}
public void setDyckzh(String dyckzh) {
this.dyckzh = dyckzh;
}
public String getDyyhckzh() {
return dyyhckzh;
}
public void setDyyhckzh(String dyyhckzh) {
this.dyyhckzh = dyyhckzh;
}
public String getDyyhxjzh() {
return dyyhxjzh;
}
public void setDyyhxjzh(String dyyhxjzh) {
this.dyyhxjzh = dyyhxjzh;
}
public String getBzly() {
return bzly;
}
public void setBzly(String bzly) {
this.bzly = bzly;
}
public String getBzsyzt() {
return bzsyzt;
}
public void setBzsyzt(String bzsyzt) {
this.bzsyzt = bzsyzt;
}
public String getBzbz1() {
return bzbz1;
}
public void setBzbz1(String bzbz1) {
this.bzbz1 = bzbz1;
}
public String getBzbz2() {
return bzbz2;
}
public void setBzbz2(String bzbz2) {
this.bzbz2 = bzbz2;
}
public String getBzbz3() {
return bzbz3;
}
public void setBzbz3(String bzbz3) {
this.bzbz3 = bzbz3;
}
public String getBzbz4() {
return bzbz4;
}
public void setBzbz4(String bzbz4) {
this.bzbz4 = bzbz4;
}
public String getBzbz5() {
return bzbz5;
}
public void setBzbz5(String bzbz5) {
this.bzbz5 = bzbz5;
}
public String getBzbz6() {
return bzbz6;
}
public void setBzbz6(String bzbz6) {
this.bzbz6 = bzbz6;
}
public String getBzbz7() {
return bzbz7;
}
public void setBzbz7(String bzbz7) {
this.bzbz7 = bzbz7;
}
public String getSfysdw() {
return sfysdw;
}
public void setSfysdw(String sfysdw) {
this.sfysdw = sfysdw;
}
public String getDwxz() {
return dwxz;
}
public void setDwxz(String dwxz) {
this.dwxz = dwxz;
}
public String getSh() {
return sh;
}
public void setSh(String sh) {
this.sh = sh;
}
public String getDwfzr() {
return dwfzr;
}
public void setDwfzr(String dwfzr) {
this.dwfzr = dwfzr;
}
public String getCwfzr() {
return cwfzr;
}
public void setCwfzr(String cwfzr) {
this.cwfzr = cwfzr;
}
public String getDwjbr() {
return dwjbr;
}
public void setDwjbr(String dwjbr) {
this.dwjbr = dwjbr;
}
public String getDwgbm() {
return dwgbm;
}
public void setDwgbm(String dwgbm) {
this.dwgbm = dwgbm;
}
public String getSfmx() {
return sfmx;
}
public void setSfmx(String sfmx) {
this.sfmx = sfmx;
}
public String getYhbm() {
return yhbm;
}
public void setYhbm(String yhbm) {
this.yhbm = yhbm;
}
public String getMqkpbz() {
return mqkpbz;
}
public void setMqkpbz(String mqkpbz) {
this.mqkpbz = mqkpbz;
}
public String getHkfs() {
return hkfs;
}
public void setHkfs(String hkfs) {
this.hkfs = hkfs;
}
public String getPjmaxsl() {
return pjmaxsl;
}
public void setPjmaxsl(String pjmaxsl) {
this.pjmaxsl = pjmaxsl;
}
public String getDwjb() {
return dwjb;
}
public void setDwjb(String dwjb) {
this.dwjb = dwjb;
}
public String getGkjzzf() {
return gkjzzf;
}
public void setGkjzzf(String gkjzzf) {
this.gkjzzf = gkjzzf;
}
public String getWebmemberid() {
return webmemberid;
}
public void setWebmemberid(String webmemberid) {
this.webmemberid = webmemberid;
}
public String getSjlbdm() {
return sjlbdm;
}
public void setSjlbdm(String sjlbdm) {
this.sjlbdm = sjlbdm;
}
public String getBemDwjb() {
return bemDwjb;
}
public void setBemDwjb(String bemDwjb) {
this.bemDwjb = bemDwjb;
}
public String getYuszkkmdm() {
return yuszkkmdm;
}
public void setYuszkkmdm(String yuszkkmdm) {
this.yuszkkmdm = yuszkkmdm;
}
public String getYufzkkmdm() {
return yufzkkmdm;
}
public void setYufzkkmdm(String yufzkkmdm) {
this.yufzkkmdm = yufzkkmdm;
}
public String getMaxrsqje() {
return maxrsqje;
}
public void setMaxrsqje(String maxrsqje) {
this.maxrsqje = maxrsqje;
}
public String getMaxdjsqje() {
return maxdjsqje;
}
public void setMaxdjsqje(String maxdjsqje) {
this.maxdjsqje = maxdjsqje;
}
public String getMaxsqjebl() {
return maxsqjebl;
}
public void setMaxsqjebl(String maxsqjebl) {
this.maxsqjebl = maxsqjebl;
}
public String getUnittype() {
return unittype;
}
public void setUnittype(String unittype) {
this.unittype = unittype;
}
public String getZjyhdm() {
return zjyhdm;
}
public void setZjyhdm(String zjyhdm) {
this.zjyhdm = zjyhdm;
}
public String getZjyhmc() {
return zjyhmc;
}
public void setZjyhmc(String zjyhmc) {
this.zjyhmc = zjyhmc;
}
public String getSqyhdm() {
return sqyhdm;
}
public void setSqyhdm(String sqyhdm) {
this.sqyhdm = sqyhdm;
}
public String getSqyhmc() {
return sqyhmc;
}
public void setSqyhmc(String sqyhmc) {
this.sqyhmc = sqyhmc;
}
public String getYqguid() {
return yqguid;
}
public void setYqguid(String yqguid) {
this.yqguid = yqguid;
}
public String getNsrsbh() {
return nsrsbh;
}
public void setNsrsbh(String nsrsbh) {
this.nsrsbh = nsrsbh;
}
public String getOrgcode() {
return orgcode;
}
public void setOrgcode(String orgcode) {
this.orgcode = orgcode;
}
public String getDwsx() {
return dwsx;
}
public void setDwsx(String dwsx) {
this.dwsx = dwsx;
}
public String getDycwckkm() {
return dycwckkm;
}
public void setDycwckkm(String dycwckkm) {
this.dycwckkm = dycwckkm;
}
public String getWbdwdm() {
return wbdwdm;
}
public void setWbdwdm(String wbdwdm) {
this.wbdwdm = wbdwdm;
}
public String getWbdwmc() {
return wbdwmc;
}
public void setWbdwmc(String wbdwmc) {
this.wbdwmc = wbdwmc;
}
}

View File

@ -0,0 +1,53 @@
package com.hzya.frame.grpU8.nxproof.pubkszl.service;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.grpU8.nxproof.pubkszl.entity.PubkszlEntity;
import com.hzya.frame.basedao.service.IBaseService;
/**
* (Pubkszl)表服务接口
*
* @author makejava
* @since 2024-08-27 15:56:54
*/
public interface IPubkszlService extends IBaseService<PubkszlEntity, String>{
/**
*
* @content 分页查询往来单位客商资料数据
* @Param
* @Return
* @Author hecan
* @Date 2024/8/27 16:23
* **/
Object queryEntityPage(JSONObject json);
/**
*
* @content 新增往来单位客商资料数据
* @Param
* @Return
* @Author hecan
* @Date 2024/8/27 17:45
* **/
Object saveEntity(JSONObject json);
/**
*
* @content 更新往来单位客商资料数据
* @Param
* @Return
* @Author hecan
* @Date 2024/8/27 17:45
* **/
Object updateEntity(JSONObject json);
/**
*
* @content 删除往来单位客商资料数据
* @Param
* @Return
* @Author hecan
* @Date 2024/8/27 17:45
* **/
Object deleteEntity(JSONObject json);
}

View File

@ -0,0 +1,74 @@
package com.hzya.frame.grpU8.nxproof.pubkszl.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
import com.hzya.frame.grpU8.nxproof.glxjllxm.entity.GlXjllxmEntity;
import com.hzya.frame.grpU8.nxproof.pubkszl.entity.PubkszlEntity;
import com.hzya.frame.grpU8.nxproof.pubkszl.dao.IPubkszlDao;
import com.hzya.frame.grpU8.nxproof.pubkszl.service.IPubkszlService;
import com.hzya.frame.web.entity.BaseResult;
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;
/**
* (Pubkszl)表服务实现类
*
* @author makejava
* @since 2024-08-27 15:56:54
*/
@Service(value = "PubkszlServiceImpl")
public class PubkszlServiceImpl extends BaseService<PubkszlEntity, String> implements IPubkszlService {
private IPubkszlDao pubkszlDao;
@Autowired
public void setPubkszlDao(IPubkszlDao dao) {
this.pubkszlDao = dao;
this.dao = dao;
}
//分页查询往来单位数据
@Override
public Object queryEntityPage(JSONObject json) {
JSONObject jsonObject = json.getJSONObject("jsonStr");
PubkszlEntity pubkszlEntity = jsonObject.toJavaObject(PubkszlEntity.class);
if(!checkStr(jsonObject.getString("kjnd"))){
logger.info("========查询往来单位传递得会计年度为空==========");
return BaseResult.getFailureMessageEntity("会计年度为空");
}
if(!checkStr(jsonObject.getString("gsdm"))){
logger.info("========查询往来单位传递得公司代码为空==========");
return BaseResult.getFailureMessageEntity("公司代码为空");
}
try {
List<PubkszlEntity> pubkszlEntities = pubkszlDao.queryPubkszlEntity(pubkszlEntity);
PageInfo pageInfo=new PageInfo(pubkszlEntities);
JSONObject object=new JSONObject();
object.put("pageInfo",pageInfo);
object.put("status","200");
return object;
}catch (Exception e){
logger.info("=======根据会计年度:{},公司代码:{}查询往来单位失败======",jsonObject.getString("kjnd"),jsonObject.getString("gsdm"),e.getMessage());
return BaseResult.getFailureMessageEntity("查询往来单位失败");
}
}
@Override
public Object saveEntity(JSONObject json) {
return null;
}
@Override
public Object updateEntity(JSONObject json) {
return null;
}
@Override
public Object deleteEntity(JSONObject json) {
return null;
}
}

View File

@ -328,7 +328,22 @@ public class SenderPubzyxxServiceImpl extends BaseService<SenderPubzyxxEntity, S
senderPubzyxxEntity.setZydm(receiverPubzyxxEntity.getZydm());
senderPubzyxxEntity.setDataSourceCode(receiverPubzyxxEntity.getDataSourceCode());
List<SenderPubzyxxEntity> senderPubzyxxEntities = queryEntityPageHealthBureau(senderPubzyxxEntity);
if(CollectionUtils.isEmpty(senderPubzyxxEntities)){
if(CollectionUtils.isNotEmpty(senderPubzyxxEntities)){
logger.info("====根据公司编码:{},会计年度:{},职员代码:{}查询数据有{}条",receiverPubzyxxEntity.getGsdm(),receiverPubzyxxEntity.getKjnd(),receiverPubzyxxEntity.getZydm(),senderPubzyxxEntities.size());
logger.info("职员代码:{}在公司代码为:{}和会计年度为{}中已经存在",receiverPubzyxxEntity.getZydm(),receiverPubzyxxEntity.getGsdm(),receiverPubzyxxEntity.getKjnd());
return BaseResult.getFailureMessageEntity("该职员编码已经存在,不保存");
}else{
receiverPubzyxxEntity.setSyzt("0");
receiverPubzyxxEntity.setGlzt("0");
receiverPubzyxxEntity.setId(receiverPubzyxxEntity.getGsdm()+'-'+receiverPubzyxxEntity.getKjnd()+'-'+receiverPubzyxxEntity.getZydm());
logger.info("==========开始保存公司编码为:{}得人员信息id为:{}=========",receiverPubzyxxEntity.getGsdm(),receiverPubzyxxEntity.getId());
SenderPubzyxxEntity receiverPubzyxxEntity1 = senderPubzyxxDao.savePubzyxxHealthBureau(receiverPubzyxxEntity);
JSONObject jsonObject1=new JSONObject();
jsonObject1.put("status","200");
jsonObject1.put("zyxx",receiverPubzyxxEntity1);
return jsonObject1;
}
/*if(CollectionUtils.isEmpty(senderPubzyxxEntities)){
receiverPubzyxxEntity.setSyzt("0");
receiverPubzyxxEntity.setGlzt("0");
receiverPubzyxxEntity.setId(receiverPubzyxxEntity.getGsdm()+'-'+receiverPubzyxxEntity.getKjnd()+'-'+receiverPubzyxxEntity.getZydm());
@ -344,7 +359,7 @@ public class SenderPubzyxxServiceImpl extends BaseService<SenderPubzyxxEntity, S
jsonObject1.put("status","200");
jsonObject1.put("zyxx",receiverPubzyxxEntity1);
return jsonObject1;
}
}*/
}catch (Exception e){
logger.info("保存公司编码为:{}得GROU8人员信息失败:{}",receiverPubzyxxEntity.getGsdm(),e.getMessage());
return BaseResult.getFailureMessageEntity("保存GROU8人员信息失败");

View File

@ -11,6 +11,16 @@ import com.hzya.frame.grpU8.nxproof.zbwhsz.entity.ZbWhszEntity;
* @since 2024-08-06 10:52:29
*/
public interface IZbWhszDao extends IBaseDao<ZbWhszEntity, String> {
/**
*
* @content 更新文号
* @Param
* @Return
* @Author hecan
* @Date 2024/8/28 17:20
* **/
ZbWhszEntity updateZbWhszEntity(ZbWhszEntity zbWhszEntity);
}

View File

@ -1,6 +1,7 @@
package com.hzya.frame.grpU8.nxproof.zbwhsz.dao.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
import com.hzya.frame.grpU8.nxproof.zbwhsz.dao.IZbWhszDao;
import com.hzya.frame.grpU8.nxproof.zbwhsz.entity.ZbWhszEntity;
@ -13,6 +14,11 @@ import org.springframework.stereotype.Repository;
*/
@Repository(value = "ZbWhszDaoImpl")
public class ZbWhszDaoImpl extends MybatisGenericDao<ZbWhszEntity, String> implements IZbWhszDao {
@Override
@DS("#zbWhszEntity.dataSourceCode")
public ZbWhszEntity updateZbWhszEntity(ZbWhszEntity zbWhszEntity) {
return super.update(zbWhszEntity);
}
}

View File

@ -11,6 +11,17 @@ import com.hzya.frame.grpU8.nxproof.zbzbly.entity.ZbZblyEntity;
* @since 2024-08-06 10:54:31
*/
public interface IZbZblyDao extends IBaseDao<ZbZblyEntity, String> {
/**
*
* @content 更新指标来源
* @Param
* @Return
* @Author hecan
* @Date 2024/8/28 17:22
* **/
ZbZblyEntity updateZbZblyEntity(ZbZblyEntity zblyEntity);
}

View File

@ -1,6 +1,7 @@
package com.hzya.frame.grpU8.nxproof.zbzbly.dao.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
import com.hzya.frame.grpU8.nxproof.zbzbly.dao.IZbZblyDao;
import com.hzya.frame.grpU8.nxproof.zbzbly.entity.ZbZblyEntity;
@ -13,6 +14,11 @@ import org.springframework.stereotype.Repository;
*/
@Repository(value = "ZbZblyDaoImpl")
public class ZbZblyDaoImpl extends MybatisGenericDao<ZbZblyEntity, String> implements IZbZblyDao {
@Override
@DS("#zblyEntity.dataSourceCode")
public ZbZblyEntity updateZbZblyEntity(ZbZblyEntity zblyEntity) {
return super.update(zblyEntity);
}
}

View File

@ -0,0 +1,8 @@
package com.hzya.frame.grpU8.service;
import com.alibaba.fastjson.JSONObject;
public interface IGrpU8Service {
Object queryData(JSONObject jsonObject);
}

View File

@ -0,0 +1,126 @@
package com.hzya.frame.grpU8.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity;
import com.hzya.frame.grpU8.acctVouchInfo.service.IAcctVouchInfoService;
import com.hzya.frame.grpU8.nxproof.glfzxzl.service.IGlFzxzlService;
import com.hzya.frame.grpU8.nxproof.glkmxx.service.ISenderGlKmxxService;
import com.hzya.frame.grpU8.nxproof.glxjllxm.service.IGlXjllxmService;
import com.hzya.frame.grpU8.nxproof.glxmzl.service.ISenderGlXmzlService;
import com.hzya.frame.grpU8.nxproof.pubbmxx.service.ISenderPubbmxxService;
import com.hzya.frame.grpU8.nxproof.pubkszl.service.IPubkszlService;
import com.hzya.frame.grpU8.service.IGrpU8Service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service(value = "grpU8Service")
public class GrpU8ServiceImpl implements IGrpU8Service {
@Resource
private IAcctVouchInfoService acctVouchInfoService;
@Autowired
private ISenderPubbmxxService senderPubbmxxService;
@Autowired
private IPubkszlService pubkszlService;
@Autowired
private IGlXjllxmService glXjllxmService;
@Autowired
private IGlFzxzlService glFzxzlService;
@Autowired
private ISenderGlXmzlService senderGlXmzlService;
@Autowired
private ISenderGlKmxxService senderGlKmxxService;
@Override
public Object queryData(JSONObject object) {
JSONObject jsonObject = getData("jsonStr", object,JSONObject.class);
if(jsonObject == null || jsonObject.get("queryType") == null || "".equals(jsonObject.getString("queryType"))){
JSONObject returnObject = new JSONObject();
returnObject.put("status","false");
returnObject.put("msg","请先传递查询类型");
return returnObject;
}
if(jsonObject.get("dataSourceCode") == null || "".equals(jsonObject.getString("dataSourceCode"))){
JSONObject returnObject = new JSONObject();
returnObject.put("status","false");
returnObject.put("msg","系统错误请联系管理员");
return returnObject;
}
Object returnObject = null;
switch (jsonObject.getString("queryType")){
case "1"://往来单位查询接口
returnObject = pubkszlService.queryEntityPage(object);
break;
case "2"://部门查询接口
returnObject = acctVouchInfoService.queryData(object);
break;
case "3"://固定辅助核算项查询接口
returnObject = glFzxzlService.queryEntityPage(object);
break;
case "4"://项目查询接口
returnObject = senderGlXmzlService.queryEntityPage(object);
break;
case "5"://功能科目查询接口
//功能科目是辅助项资料类别为4得数据
if(jsonObject.getString("lbdm") !=null && jsonObject.getString("lbdm").equals("4")){
returnObject = glFzxzlService.queryEntityPage(object);
}
break;
case "6"://部门经济科目查询接口
//部门经济科目是辅助项资料类别为5得数据
if(jsonObject.getString("lbdm") !=null && jsonObject.getString("lbdm").equals("5")){
returnObject = glFzxzlService.queryEntityPage(object);
}
break;
case "7"://科目总账余额查询接口
returnObject = senderGlKmxxService.queryKmxxLedgerBalance(object);
break;
case "8"://科目辅助余额查询接口
break;
case "9"://现金流量项目查询接口
returnObject=glXjllxmService.queryEntityPage(object);
break;
case "10"://总账凭证查询接口 ml
returnObject = acctVouchInfoService.queryPzml(object);
break;
case "11"://总账凭证查询分路接口 nr
returnObject = acctVouchInfoService.queryPznr(object);
break;
case "12"://总账凭证单个查询接口 ml nr fzhs 单个
returnObject = acctVouchInfoService.queryPz(object);
break;
case "13"://总账凭证查询分页接口 ml nr fzhs 分页
returnObject = acctVouchInfoService.queryPzPage(object);
break;
default:
JSONObject jsonObject1 = new JSONObject();
jsonObject1.put("status","false");
jsonObject1.put("msg","查询类型错误,请联系管理员");
returnObject = jsonObject1;
break;
}
return returnObject;
}
protected <T> T getData(String key, JSONObject jsonObject, Class<T> clz) {
if (checkStr(jsonObject.getString(key)) ) {
return jsonObject.getJSONObject(key).toJavaObject(clz);
}
return null;
}
/**
* @param str
* @return void
* @Author lvleigang
* @Description 校验字符串
* @Date 11:41 上午 2022/12/7
**/
protected Boolean checkStr(String str) {
Boolean flag = true;
if (str == null || "".equals(str)) {
flag = false;
}
return flag;
}
}

View File

@ -48,7 +48,7 @@ public class FlywayConfig {
@PostConstruct
public void migrateOrder() {
if("false".equals(enabled)){
if(!"false".equals(enabled)){
String pwd = AESUtil.decrypt(password);
DynamicRoutingDataSource ds = (DynamicRoutingDataSource) dataSource;
DataSource dsDatasource = null;