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

yifu-order/yifu-order-biz/src/main/resources/application-dev.yml

@@ -8,14 +8,24 @@ spring:
   redis:
     host: 127.0.0.1
     port: 6379
-    password:
+    password: '@yf_2017'
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: yf_zsk
     url: jdbc:mysql://192.168.1.65:22306/mvp_order?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-
+    hikari:
+      driver-class-name: ${spring.datasource.driver-class-name}
+      jdbc-url: ${spring.datasource.url}
+      username: ${spring.datasource.username}
+      password: ${spring.datasource.password}
+      pool-name: AmytangHikariCP
+      minimum-idle: 10 # 最小空闲连接数量
+      idle-timeout: 60000 # 空闲连接存活最大时间，默认600000（10分钟）
+      maximum-pool-size: 12 # 连接池最大连接数，默认是10
+      auto-commit: true  #此属性控制从池返回的连接的默认自动提交行为,默认值：true
+      max-lifetime: 0 #此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认1800000即30分钟
 
 
 

yifu-salary/yifu-salary-biz/src/main/resources/mapper/THaveSalaryNosocialMapper.xml

@@ -73,7 +73,7 @@
                 AND a.SETTLEMENT_ORGAN_NO LIKE CONCAT('%',  #{tHaveSalaryNosocial.settlementOrganNo},'%')
             </if>
             <if test="tHaveSalaryNosocial.month != null">
-                AND a.month = #{tHaveSalaryNosocial.month}
+                AND a.month  like concat('%', #{tHaveSalaryNosocial.month}, '%')
             </if>
             <if test="tHaveSalaryNosocial.createMonth != null">
                 AND a.CREATE_MONTH = #{tHaveSalaryNosocial.createMonth}

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml

@@ -307,6 +307,7 @@
 					AND a.STATUS = #{tSalaryStandard.status}
 				</if>
 			</if>
+			ORDER BY CREATE_TIME DESC
 		</where>
 	</select>
 	<resultMap id="salaryStandardExportMap" type="com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardExportVo">

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsRemunerationMapper.xml

@@ -88,7 +88,7 @@
 	<select id="doStatisticsRemuneration" resultMap="tStatisticsRemunerationMap">
 		select
 			#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,sum(a.SALARY_TAX) PERSONAL_TAX,
-			sum(a.SALARY_TAX_UNIT) INCOME,a.INVOICE_TITLE DECLARE_UNIT,'居民身份证' CARD_TYPE
+			sum(a.RELAY_SALARY) INCOME,a.INVOICE_TITLE DECLARE_UNIT,'居民身份证' CARD_TYPE
 		from t_salary_account a
 		where a.DELETE_FLAG = 0 and a.SETTLEMENT_MONTH = #{lastMonth} and a.FORM_TYPE = '4'
 		GROUP BY a.EMP_IDCARD,DECLARE_UNIT