项目指标增删改

service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/IGbiZbxmbDao.java

@@ -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);
 }

service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/dao/impl/GbiZbxmbDaoImpl.java

@@ -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);
+    }
+
 }
 

service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.java

@@ -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() {
+    public String getAuditor() {
-        return shr;
+        return auditor;
     }
 
-    public void setShr(String shr) {
+    public void setAuditor(String auditor) {
-        this.shr = shr;
+        this.auditor = auditor;
     }
 
     public String getShrq() {

service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/entity/GbiZbxmbEntity.xml

@@ -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>
 

service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/IGbiZbxmbService.java

@@ -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);
 }

service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/impl/GbiZbxmbServiceImpl.java

@@ -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;
 
 /**
@@ -80,6 +83,20 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
 					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());
+			List<GbiZbxmbEntity> gbiZbxmbEntities = gbiZbxmbDao.queryGbiZbxmbEntity(gbiZbxmbEntity);
+			if(CollectionUtils.isNotEmpty(gbiZbxmbEntities)){
+				return BaseResult.getFailureMessageEntity("保存指标失败,该指标已经存在");
+			}
+		}catch (Exception e){
+			logger.info("保存项目指标失败:{}",e.getMessage());
+			return BaseResult.getFailureMessageEntity("保存指标失败");
+		}
 		//更新其他表得使用状态
 		JsonResultEntity jsonResultEntity = updateOtherTable(gbiZbxmbEntity);
 		//保存指标项目表
@@ -97,9 +114,10 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
 			gbiZbxmbEntity.setSjzbid(0);//上级指标id
 
 			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 +126,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("保存指标失败");
 		}
 	}
@@ -141,9 +159,10 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
 			gbiZbxmbEntity.setZt("1");
 			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 +171,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");
@@ -183,9 +202,10 @@ public class GbiZbxmbServiceImpl extends BaseService<GbiZbxmbEntity, String> imp
 		try {
 			gbiZbxmbEntity.setZt("1");
 			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 +214,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 +226,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 +260,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 +276,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 +293,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 +310,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 +326,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 +346,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 +359,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 +372,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){

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

@@ -84,5 +84,15 @@ public interface ISenderGlPzmlDao extends IBaseDao<SenderGlPzmlEntity, String> {
     Integer deleteGlPzmlHealthBureau(SenderGlPzmlEntity senderGlPzmlEntity);
 
     SenderGlPzmlEntity queryPzmlByIdpzh(SenderGlPzmlEntity entity);
+
+    /**
+     *
+     * @content 查询凭证 商学院
+     * @Param
+     * @Return
+     * @Author hecan
+     * @Date 2024/8/14 16:25
+     * **/
+    List<SenderGlPzmlEntity> queryGlPzmlSxy(SenderGlPzmlEntity senderGlPzmlEntity);
 }
 

service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java

@@ -70,6 +70,12 @@ public class SenderGlPzmlDaoImpl extends MybatisGenericDao<SenderGlPzmlEntity, S
 
     }
 
+    @Override
+    @DS("#senderGlPzmlEntity.dataSourceCode")
+    public List<SenderGlPzmlEntity> queryGlPzmlSxy(SenderGlPzmlEntity senderGlPzmlEntity) {
+        return (List<SenderGlPzmlEntity>) super.selectList("queryGlPzmlSxy",senderGlPzmlEntity);
+    }
+
 
 }
 

service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml

@@ -259,6 +259,31 @@
     </trim>
 </select>
 
+    <!-- 查询列表 商学院所需要的凭证数据-->
+    <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
+        from GL_Pzml pzml
+        left join gl_pznr pznr on pznr.idpzh=pzml.idpzh and pzml.kjqj=pznr.kjqj
+        <trim prefix="where" prefixOverrides="and">
+            <if test="idpzh !=null and  idpzh!='' "> and pzml.idpzh = #{idpzh} </if>
+            and pzml.kjqj =#{kjqj}  and pznr.kjqj =#{kjqj} 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
+
+    </select>
+
 <!--新增所有列-->
 <insert id="entity_insert" parameterType = "com.hzya.frame.grpU8.nxproof.glPzml.entity.SenderGlPzmlEntity" keyProperty="" useGeneratedKeys="true">
     insert into gl_pzml(

service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/ISenderGlPzmlService.java

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

service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java

@@ -8,6 +8,8 @@ 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.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;
@@ -22,6 +24,9 @@ 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.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -40,6 +45,8 @@ public class SenderGlPzmlServiceImpl extends BaseService<SenderGlPzmlEntity, Str
 	private static String URL="http://192.168.42.22/";//正式环境
 
 	private ISenderGlPzmlDao senderGlPzmlDao;
+	@Autowired
+	private IGbiZbxmbDao gbiZbxmbDao;
 
 	@Autowired
 	public void setSenderGlPzmlDao(ISenderGlPzmlDao dao) {
@@ -668,7 +675,8 @@ public class SenderGlPzmlServiceImpl extends BaseService<SenderGlPzmlEntity, Str
 
 	//保存凭证 商学院，指标被哪些凭证使用
 	@Override
-	public Object saveGlPzmlSxy(JSONObject jsonObject){
+	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"));
@@ -679,29 +687,71 @@ public class SenderGlPzmlServiceImpl extends BaseService<SenderGlPzmlEntity, Str
 			return BaseResult.getFailureMessageEntity("token为空，请先获取token");
 		}
 		//查询凭证数据
-		List<SenderGlPzmlEntity> pzmlEntities = senderGlPzmlDao.query(glPzmlEntity);
+		List<SenderGlPzmlEntity> list = senderGlPzmlDao.queryGlPzmlSxy(glPzmlEntity);
-		if(CollectionUtils.isEmpty(pzmlEntities)){
+		if(CollectionUtils.isEmpty(list)){
 			return BaseResult.getSuccessMessageEntity("没有需要同步得凭证",null);
 		}
-		for (SenderGlPzmlEntity pzmlEntity : pzmlEntities) {
+		try {
-			String pzNum = pzmlEntity.getGsdm() + "_" + pzmlEntity.getZth() + "_" + pzmlEntity.getKjqj() + "_" + pzmlEntity.getPzh();
+			String result=null;
-			JSONObject jsonObjectParams=new JSONObject();
+			for (SenderGlPzmlEntity pzmlEntity : list) {
-			jsonObjectParams.put("code",pzmlEntity.getIdpzh());//pzid
+				String pzNum = pzmlEntity.getGsdm() + "_" + pzmlEntity.getZth() + "_" + pzmlEntity.getKjqj() + "_" + pzmlEntity.getPzh();
-			jsonObjectParams.put("budgetYear",pzmlEntity.getKjqj().substring(0,4));//预算年度
+				//转换日期，如将20240514转为2024-05-14
-			jsonObjectParams.put("applyDate",DateUtil.format(new Date(),"yyyy-MM-dd"));//日期
+				SimpleDateFormat inputFormat = new SimpleDateFormat("yyyyMMdd");
-			jsonObjectParams.put("userCode","");//用户编码
+				SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd");
-			jsonObjectParams.put("depCode","");//部门编码
+				Date date = inputFormat.parse(pzmlEntity.getSrrq());
-			jsonObjectParams.put("description",pzmlEntity.getPzzy());//说明
+				String outputDateString = outputFormat.format(date);
-			jsonObjectParams.put("amount",pzmlEntity.getPzje());//金额
+				//将金额四舍五入
-			jsonObjectParams.put("pzNum",pzNum);//凭证号 例如：公司代码+账套号+会计期间+凭证号：001_001_202408_付款_1
+				BigDecimal bigDecimalValue = new BigDecimal(pzmlEntity.getPzje());
-			JSONArray jsonArray=new JSONArray();
+				BigDecimal roundedValue = bigDecimalValue.setScale(2,
-			jsonArray.add(jsonObjectParams);
+						RoundingMode.HALF_UP);
-			JSONObject jsonObjectData=new JSONObject();
+				JSONObject jsonObjectParams=new JSONObject();
-			jsonObjectData.put("data",jsonArray);
+				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)){
+					jsonObjectParams.put("reimburseItems",new ArrayList<>());
+				}else{
+					JSONArray jsonArray=new JSONArray();
+					for (GbiZbxmbEntity zbxmbEntity : gbiZbsyrecEntities) {
+						BigDecimal bigDecimalValueZbxmb = new BigDecimal(zbxmbEntity.getJe());
+						BigDecimal roundedValueZbxmb = bigDecimalValueZbxmb.setScale(2, RoundingMode.HALF_UP);
+						JSONObject jsonObjectZbxm=new JSONObject();
+						jsonObjectZbxm.put("thirdProjectCode",zbxmbEntity.getZbid());
+						jsonObjectZbxm.put("amount",roundedValueZbxmb);
+						jsonObjectZbxm.put("financialCode",zbxmbEntity.getJjkmdm());
+						jsonArray.add(jsonObjectZbxm);
+					}
+					jsonObjectParams.put("reimburseItems",jsonArray);
+				}
+				JSONArray jsonArray=new JSONArray();
+				jsonArray.add(jsonObjectParams);
+				JSONObject jsonObjectData=new JSONObject();
+				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();
+				logger.info("调用商学院凭证保存接口返回参数：{}",result);
+			}
+			JSONObject jsonObjectResult=new JSONObject();
+			jsonObjectResult.put("status","200");
+			jsonObjectResult.put("pzml",result);
+			return jsonObjectResult;
+		}catch (Exception e){
+			logger.info("根据凭证idpzh:{}查询指标失败:{}",glPzmlEntity.getIdpzh(),e.getMessage());
+			return BaseResult.getFailureMessageEntity("根据凭证查询指标失败");
 		}
-		return null;
 	}
 
 

service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/IGlCzrzDao.java

@@ -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);
 }
 

service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/dao/impl/GlCzrzDaoImpl.java

@@ -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);
+    }
 }
 

service/src/main/java/com/hzya/frame/grpU8/nxproof/glczrz/entity/GlCzrzEntity.xml

@@ -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>
+            date ,
-            <if test="zwrq != null and zwrq != ''"> zwrq , </if>
+            zwrq ,
-            <if test="qssj != null and qssj != ''"> qssj , </if>
+             qssj ,
-            <if test="zzsj != null and zzsj != ''"> zzsj , </if>
+            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="date = null and date = ''">  convert(char(8),getdate(),112),</if>
-            <if test="zwrq != null and zwrq != ''"> select convert(char(8),getdate(),112) ,</if>
+            <if test="zwrq = null and zwrq = ''">  convert(char(8),getdate(),112) ,</if>
-            <if test="qssj != null and qssj != ''"> select convert(char(8),getdate(),108) ,</if>
+            <if test="qssj = null and qssj = ''">  convert(char(8),getdate(),108) ,</if>
-            <if test="zzsj != null and zzsj != ''"> select 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>

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

@@ -27,5 +27,15 @@ public interface IGlFzxzlDao extends IBaseDao<GlFzxzlEntity, String> {
      * @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);
 }
 

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

@@ -32,5 +32,11 @@ public class GlFzxzlDaoImpl extends MybatisGenericDao<GlFzxzlEntity, String> imp
     public List<GlFzxzlEntity> queryGlFzxzlEntity(GlFzxzlEntity glFzxzlEntity) {
         return super.queryByLike(glFzxzlEntity);
     }
+
+    @Override
+    @DS("#glFzxzlEntity.dataSourceCode")
+    public GlFzxzlEntity updateGlFzxzlEntity(GlFzxzlEntity glFzxzlEntity) {
+        return super.update(glFzxzlEntity);
+    }
 }
 

service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/ISenderGlKmxxDao.java

@@ -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);
 
 
 }

service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/dao/impl/SenderGlKmxxDaoImpl.java

@@ -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);
+    }
 }
 

service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/entity/SenderGlKmxxEntity.xml

@@ -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(

service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/service/ISenderGlKmxxService.java

@@ -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);
+
 
 }

service/src/main/java/com/hzya/frame/grpU8/nxproof/glkmxx/service/impl/SenderGlKmxxServiceImpl.java

@@ -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("查询科目总账余额失败");
+		}
+	}
 }

service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/IZbWhszDao.java

@@ -12,5 +12,15 @@ import com.hzya.frame.grpU8.nxproof.zbwhsz.entity.ZbWhszEntity;
  */
 public interface IZbWhszDao extends IBaseDao<ZbWhszEntity, String> {
 
+    /**
+     *
+     * @content 更新文号
+     * @Param
+     * @Return
+     * @Author hecan
+     * @Date 2024/8/28 17:20
+     * **/
+    ZbWhszEntity updateZbWhszEntity(ZbWhszEntity zbWhszEntity);
+
 }
 

service/src/main/java/com/hzya/frame/grpU8/nxproof/zbwhsz/dao/impl/ZbWhszDaoImpl.java

@@ -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;
@@ -14,5 +15,10 @@ 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);
+    }
 }
 

service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/IZbZblyDao.java

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

service/src/main/java/com/hzya/frame/grpU8/nxproof/zbzbly/dao/impl/ZbZblyDaoImpl.java

@@ -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;
@@ -14,5 +15,10 @@ 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);
+    }
 }