Merge branch 'feat-20220721-eidcert' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmPayOffController.java

@@ -324,7 +324,7 @@ public class WmPayOffController {
 	@PostMapping("/settleIssueBySubType")
 	public R<?> settleIssueBySubType(@RequestBody WmScorePackageSettleInput input) {
 
-		if (StrUtil.isAllNotBlank(input.getId(),input.getScorePackageName() ) || input.getSubjectLocation() == null || CollUtil.isEmpty(input.getNotes()) || null == input.getInvoiceCategory()){
+		if (StrUtil.isAllNotBlank(input.getId(), input.getScorePackageName()) || input.getSubjectLocation() == null || CollUtil.isEmpty(input.getNotes()) || null == input.getInvoiceCategory()) {
 			return R.failed("数据异常");
 		}
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -2597,6 +2597,12 @@ public class WmScorePackageController {
 				return R.failed("积分包分值必须大于0");
 			}
 		}
+
+		if (wmScorePackage.getSubjectLocation() != null){
+			wmScorePackage.setSubType(String.valueOf(wmScorePackage.getSubjectLocation().getGigType().getCode()));
+		}
+
+
 		return wmScorePackageService.addWmScorePackage(wmScorePackage);
 	}
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/input/WmScorePackageSettleOutput.java

@@ -1,5 +1,6 @@
 package com.qunzhixinxi.hnqz.admin.entity.input;
 
+import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -55,6 +56,8 @@ public class WmScorePackageSettleOutput {
 
 	private String subType;
 
+	private SubjectLocation subjectLocation;
+
 	/**
 	 * 积分包来源， 0->手动， 1->线上
 	 */

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/SysDeptSubMapper.xml

@@ -20,16 +20,16 @@
 		t.id_card_number,
 		sum(t.settle_amount) AS totalAmount
 		FROM wm_score_package_settle_note t
-		WHERE t.subject_location = #{query.subjectLocation, jdbcType=VARCHAR}
+		WHERE t.subject_location = #{query.location, jdbcType=VARCHAR}
 		AND t.create_time > #{query.startTime,jdbcType=TIMESTAMP}
 		AND t.create_time < #{query.endTime,jdbcType=TIMESTAMP}
 		AND t.id_card_number IN
-		<foreach item="item" index="index" collection="query.idCard" open="(" separator="," close=")">
+		<foreach item="item" index="index" collection="query.idCards" open="(" separator="," close=")">
 			#{item}
 		</foreach>
-		<if test="query.ids != null and query.ids.size()>0">
+		<if test="query.settleNoteIds != null and query.settleNoteIds.size()>0">
 			AND t.id NOT IN
-			<foreach item="item" index="index" collection="query.ids" open="(" separator="," close=")">
+			<foreach item="item" index="index" collection="query.settleNoteIds" open="(" separator="," close=")">
 				#{item}
 			</foreach>
 		</if>
@@ -41,16 +41,16 @@
 		t.user_id,
 		sum(t.settle_amount) AS totalAmount
 		FROM wm_score_package_settle_note t
-		WHERE t.subject_location = #{query.subjectLocation, jdbcType=VARCHAR}
+		WHERE t.subject_location = #{query.location, jdbcType=VARCHAR}
 		AND t.create_time &gt; #{query.startTime,jdbcType=TIMESTAMP}
 		AND t.create_time &lt; #{query.endTime,jdbcType=TIMESTAMP}
 		AND t.user_id IN
 		<foreach item="item" index="index" collection="query.userIds" open="(" separator="," close=")">
 			#{item}
 		</foreach>
-		<if test="query.ids != null and query.ids.size()>0">
+		<if test="query.settleNoteIds != null and query.settleNoteIds.size()>0">
 			AND t.id NOT IN
-			<foreach item="item" index="index" collection="query.ids" open="(" separator="," close=")">
+			<foreach item="item" index="index" collection="query.settleNoteIds" open="(" separator="," close=")">
 				#{item}
 			</foreach>
 		</if>
@@ -64,12 +64,12 @@
 		WHERE t.create_time &gt; #{query.startTime,jdbcType=TIMESTAMP}
 		AND t.create_time &lt; #{query.endTime,jdbcType=TIMESTAMP}
 		AND t.id_card_number IN
-		<foreach item="item" index="index" collection="query.idCard" open="(" separator="," close=")">
+		<foreach item="item" index="index" collection="query.idCards" open="(" separator="," close=")">
 			#{item}
 		</foreach>
-		<if test="query.ids != null and query.ids.size()>0">
+		<if test="query.settleNoteIds != null and query.settleNoteIds.size()>0">
 			AND t.id NOT IN
-			<foreach item="item" index="index" collection="query.ids" open="(" separator="," close=")">
+			<foreach item="item" index="index" collection="query.settleNoteIds" open="(" separator="," close=")">
 				#{item}
 			</foreach>
 		</if>

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageMapper.xml

@@ -1425,6 +1425,7 @@
 		       p.package_type2,
 		       p.sub_type,
 		       p.source_type,
+		       p.subject_location,
 		       p.oms_order_sn
 		FROM wm_score_package p, sys_dept d
 		WHERE