基本信息-科目查询优化

src/main/java/io/renren/modules/app/service/impl/FwwxdshServiceImpl.java

@@ -576,9 +576,9 @@ public class FwwxdshServiceImpl extends ServiceImpl<FwwxdshDao, SqwxzqEntity> im
 				sqwxzqEntitys.get(i).setJsbzhu(s.getBz());
 				// 已决算，则下方房屋信息分摊列表通过jsdbh查询ywpzmx表
 				List<FwxxEntity> f = baseMapper.selectfwbyftqc(sqwxzqEntitys.get(i).getSqdbh());
-				List<String> djbhs=baseMapper.selectdjbhbysqdbh2(sqwxzqEntitys.get(i).getSqdbh());
-				String djbhss="(";
-				for(String djbh:djbhs){
+				List<String> djbhs = baseMapper.selectdjbhbysqdbh2(sqwxzqEntitys.get(i).getSqdbh());
+				String djbhss = "(";
+				for (String djbh : djbhs) {
 					if (djbh.equals(djbhs.get(0))) {
 						djbhss = djbhss + djbhs.get(0);
 					} else if (djbhs.size() > 1) {
@@ -586,14 +586,14 @@ public class FwwxdshServiceImpl extends ServiceImpl<FwwxdshDao, SqwxzqEntity> im
 					}
 				}
 				djbhss = djbhss + ")";
-				List<YwpzmxEntity> listft=baseMapper.selectftqcsc2(djbhss);
+				List<YwpzmxEntity> listft = baseMapper.selectftqcsc2(djbhss);
 				for (FwxxEntity fEntity : f) {
 					//--------------------------------
-					for(YwpzmxEntity m:listft){
-						if(fEntity.getFwbm().equals(m.getFwbm())){
+					for (YwpzmxEntity m : listft) {
+						if (fEntity.getFwbm().equals(m.getFwbm())) {
 							fEntity.setDwje(m.getQdwje());
 							fEntity.setGrje(m.getQgrje());
-							fEntity.setDqye((double) Math.round((m.getQdwje()+m.getQgrje()) * 100) / 100);
+							fEntity.setDqye((double) Math.round((m.getQdwje() + m.getQgrje()) * 100) / 100);
 						}
 					}
 					//--------------------------------
@@ -634,14 +634,14 @@ public class FwwxdshServiceImpl extends ServiceImpl<FwwxdshDao, SqwxzqEntity> im
 			// 计算每个维修单这个项目下所有房屋的sum(grje)+sum(dwje)(首次拨付前的账户金额和首次拨付后的账户金额)
 			// 先计算余额拨付前的账户金额：
 			SqwxzqEntity s1 = baseMapper.selectscbfqxmje(xmbms);
-			Double je=baseMapper.selectscwca(sqwxzqEntitys.get(i).getSqrq(), xmbms);
+			Double je = baseMapper.selectscwca(sqwxzqEntitys.get(i).getSqrq(), xmbms);
 			// 再计算余额拨付后的账户金额：
 //			SqwxzqEntity s2 = baseMapper.selectscbfhxmje2(xmbms);
-			sqwxzqEntitys.get(i).setScbfqxmje(s1.getScbfqxmje()-je-sqwxzqEntitys.get(i).getSpje());
-			if(sqwxzqEntitys.get(i).getYebfje()!=null){
-				sqwxzqEntitys.get(i).setScbfhxmje(s1.getScbfqxmje()-je-sqwxzqEntitys.get(i).getSpje()-sqwxzqEntitys.get(i).getYebfje());
-			}else{
-				sqwxzqEntitys.get(i).setScbfhxmje(s1.getScbfqxmje()-je-sqwxzqEntitys.get(i).getSpje());
+			sqwxzqEntitys.get(i).setScbfqxmje(s1.getScbfqxmje() - je - sqwxzqEntitys.get(i).getSpje());
+			if (sqwxzqEntitys.get(i).getYebfje() != null) {
+				sqwxzqEntitys.get(i).setScbfhxmje(s1.getScbfqxmje() - je - sqwxzqEntitys.get(i).getSpje() - sqwxzqEntitys.get(i).getYebfje());
+			} else {
+				sqwxzqEntitys.get(i).setScbfhxmje(s1.getScbfqxmje() - je - sqwxzqEntitys.get(i).getSpje());
 			}
 			FjEntity js2 = baseMapper.selectwjdxbyfjid(sqwxzqEntitys.get(i).getFjid());
 			if (js2 != null || !"".equals(js2)) {

src/main/java/io/renren/modules/app/service/impl/HKmServiceImpl.java

@@ -72,6 +72,8 @@ public class HKmServiceImpl extends ServiceImpl<HKmDao, HKmEntity> implements HK
 				list=baseMapper.selectsjcd10222(hKmEntity);
 			}else if("4001".equals(hKmEntity.getKm())){
 				list=baseMapper.selectsjcd102222(hKmEntity);
+			}else if("4101".equals(hKmEntity.getKm())){
+				list=baseMapper.selectsjcd102222(hKmEntity);
 			}
 		}else if(res<=0){//旧科目
 			if("101".equals(hKmEntity.getKm())){

src/main/resources/application-dev.yml

@@ -3,10 +3,10 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
     druid:
-            first:  #数据源1
-                url: jdbc:mysql://192.168.101.231:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+      first: #主要数据库
+        url: jdbc:mysql://192.168.101.152:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
         username: root
-                password: mysql123
+        password: root
         initial-size: 10
         max-active: 100
         min-idle: 10

src/main/resources/mapper/app/HKmDao.xml

@@ -92,7 +92,7 @@
 	<select id="selectsjcd102222" parameterType="io.renren.modules.app.entity.HKmEntity"
 		resultType="io.renren.modules.app.entity.HKmEntity">
 		select km,kmmc,pydm,kmlbbm,kmsx,djkm,jbh from h_km where km
-		LIKE '4001%' and LENGTH(km)=6 and ztbm='0003'
+		LIKE  concat(#{km},'%') and LENGTH(km)=6 and ztbm='0003'
 	</select>
 
 	<select id="selectsjcd110" parameterType="io.renren.modules.app.entity.HKmEntity"