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

Merge remote-tracking branch 'origin/grpU8' into grpU8 

# Conflicts:
#	service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/IGlFzxzlDao.java
#	service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/impl/GlFzxzlDaoImpl.java
This commit is contained in:
hecan 2024-08-28 10:45:23 +08:00
parent ee06735f34 3631afd647
commit c3497d1078
15 changed files with 567 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java
View File

@ -29,4 +29,17 @@ 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);
}

194
service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/impl/AcctVouchInfoServiceImpl.java
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;
@ -103,4 +118,181 @@ 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);
//查询辅助核算
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);
//todo 查询数据，设置值
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;
}
}
}

3
service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/ISenderGlPzmlDao.java
View File

@ -83,7 +83,6 @@ public interface ISenderGlPzmlDao extends IBaseDao<SenderGlPzmlEntity, String> {
* **/
Integer deleteGlPzmlHealthBureau(SenderGlPzmlEntity senderGlPzmlEntity);
SenderGlPzmlEntity queryPzmlByIdpzh(SenderGlPzmlEntity entity);
}

11
service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java
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;
@ -60,5 +62,14 @@ public class SenderGlPzmlDaoImpl extends MybatisGenericDao<SenderGlPzmlEntity, S
public Integer deleteGlPzmlHealthBureau(SenderGlPzmlEntity senderGlPzmlEntity) {
return super.delete("SenderGlPzmlEntity_delete_pzml",senderGlPzmlEntity);
}
@DS("#entity.dataSourceCode")
@Override
public SenderGlPzmlEntity queryPzmlByIdpzh(SenderGlPzmlEntity entity) {
return super.queryOne(entity);
}
}

1
service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/ISenderGlPznrDao.java
View File

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

7
service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/dao/impl/SenderGlPznrDaoImpl.java
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,12 @@ 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;
}
}

21
service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.java
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,8 @@ private String hzflh;
private String cyxfx;
private String dqrq;
private String glidpznr;
private String fzhs;
private List<JSONObject> fzhslist;
public String getBxdid() {
return bxdid;
}
@ -814,5 +818,20 @@ 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;
}
}

148
service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml
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">
@ -891,6 +892,153 @@ 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>
</trim>
</select>
</mapper>

5
service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/IGlFzxzlDao.java
View File

@ -1,8 +1,10 @@
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;
@ -14,7 +16,6 @@ import java.util.List;
*/
public interface IGlFzxzlDao extends IBaseDao<GlFzxzlEntity, String> {
//查询辅助项资料
List<GlFzxzlEntity> queryGlFzxzlEntity(GlFzxzlEntity glFzxzlEntity);
List<JSONObject> queryFzhs(GlFzxzlEntityDto glFzxzlEntityDto);
}

11
service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/dao/impl/GlFzxzlDaoImpl.java
View File

@ -1,10 +1,13 @@
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;
@ -17,11 +20,11 @@ import java.util.List;
*/
@Repository(value = "GlFzxzlDaoImpl")
public class GlFzxzlDaoImpl extends MybatisGenericDao<GlFzxzlEntity, String> implements IGlFzxzlDao {
@DS("#glFzxzlEntity.dataSourceCode")
@DS("#glFzxzlEntityDto.dataSourceCode")
@Override
public List<GlFzxzlEntity> queryGlFzxzlEntity(GlFzxzlEntity glFzxzlEntity) {
return super.queryByLike(glFzxzlEntity);
public List<JSONObject> queryFzhs(GlFzxzlEntityDto glFzxzlEntityDto) {
List<JSONObject> o = (List<JSONObject>) super.selectList(getSqlIdPrifx() + "queryFzhs", glFzxzlEntityDto);
return o;
}
}

52
service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntity.xml
View File

@ -280,5 +280,57 @@ 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
<include refid="GlFzxzlEntity_Base_Column_List" />
from GL_Fzxzl
<trim prefix="where" prefixOverrides="and">
<if test="gsdm != null and gsdm != ''"> and gsdm like concat('%',#{gsdm},'%') </if>
<if test="kjnd != null and kjnd != ''"> and kjnd like concat('%',#{kjnd},'%') </if>
<if test="lbdm != null and lbdm != ''"> and lbdm like concat('%',#{lbdm},'%') </if>
<if test="fzdm != null and fzdm != ''"> and fzdm like concat('%',#{fzdm},'%') </if>
<if test="fzmc != null and fzmc != ''"> and fzmc like concat('%',#{fzmc},'%') </if>
<if test="zjm != null and zjm != ''"> and zjm like concat('%',#{zjm},'%') </if>
<if test="f1 != null and f1 != ''"> and f1 like concat('%',#{f1},'%') </if>
<if test="f2 != null and f2 != ''"> and f2 like concat('%',#{f2},'%') </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="sjly != null and sjly != ''"> and Sjly like concat('%',#{sjly},'%') </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="sfmx != null and sfmx != ''"> and SFMX like concat('%',#{sfmx},'%') </if>
<if test="gnlb != null and gnlb != ''"> and GNLB like concat('%',#{gnlb},'%') </if>
<if test="gnlbmc != null and gnlbmc != ''"> and GNLBMC like concat('%',#{gnlbmc},'%') </if>
</trim>
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
WHERE
<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" index="index1" item="item1" open="(" separator="or" close=")">
fzxlb.lbdm = #{item1.lbdm} AND fzxzl.fzdm = #{item1.fzdm}
</foreach>
</foreach>
)
</if>
</trim>
</select>
</mapper>

30
service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntityDto.java Normal file
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;
}
}

29
service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlNrDmEntityDto.java Normal file
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;
}
}

40
service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlNrEntityDto.java Normal file
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;
}
}

15
service/src/main/java/com/hzya/frame/grpU8/service/impl/GrpU8ServiceImpl.java
View File

@ -39,6 +39,12 @@ public class GrpU8ServiceImpl implements IGrpU8Service {
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"://往来单位查询接口
@ -69,12 +75,15 @@ public class GrpU8ServiceImpl implements IGrpU8Service {
returnObject=glXjllxmService.queryEntityPage(object);
break;
case "10"://总账凭证查询接口 ml
returnObject = acctVouchInfoService.queryPzml(object);
break;
case "11"://象山总账凭证查询接口 nr
case "11"://总账凭证查询分路接口 nr
returnObject = acctVouchInfoService.queryPznr(object);
break;
case "12"://象山总账凭证查询接口 ml nr fzhs 单个
case "12"://总账凭证单个查询接口 ml nr fzhs 单个
returnObject = acctVouchInfoService.queryPz(object);
break;
case "13"://象山总账凭证查询接口 ml nr fzhs 分页
case "13"://总账凭证查询分页接口 ml nr fzhs 分页
break;
default:
JSONObject jsonObject1 = new JSONObject();