Merge branch 'feat-wenwen-20220214'

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

@@ -152,19 +152,9 @@ public class WmPayOffController {
 
 		input.setSendPackageDeptId(SecurityUtils.getUser().getDeptId() +"");
 		input.setPackageFinishStatus("1");
-//		input.setPackageType1("1");
-//		input.setPackageType2("1");
 		input.setTypeid("4");
 		input.setSettleFlag("1");
 		IPage<WmScorePackageSettleOutput> outputList = wmScorePackageService.listPackageSettleList(page, input);
-//		for (int i = 0; i < outputList.getRecords().size(); i++) {
-//			WmScorePackageSettleNote wmScorePackageSettleNote = new WmScorePackageSettleNote();
-//			wmScorePackageSettleNote.setPackageId(outputList.getRecords().get(i).getId());
-//			List<WmScorePackageSettleNote> wmScorePackageSettleNoteList = wmScorePackageSettleNoteService.selectByPackageId(wmScorePackageSettleNote);
-//			if(wmScorePackageSettleNoteList.size()>0){
-//				outputList.getRecords().get(i).setBelongDate(String.valueOf(wmScorePackageSettleNoteList.get(0).getNotifyTime()));
-//			}
-//		}
 		return R.ok(outputList);
 	}
 

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

@@ -55,4 +55,9 @@ public class WmScorePackageSettleOutput {
 
 	private String subType;
 
+	/**
+	 * 积分包来源， 0->手动， 1->线上
+	 */
+	private String sourceType;
+
 }

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

@@ -1230,12 +1230,22 @@
 
 	</select>
 	<select id="getPackageListForReceive" resultType="com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageApiOutput">
-		SELECT p.id, p.score_package_name, p.send_package_dept_id, p.task_add_flag,
-		p.create_time, p.package_type1, p.user_num, p.task_num, p.description, p.belong_date,
-		p.score, d.name packageEntName
+		SELECT
+		       p.id,
+		       p.score_package_name,
+		       p.send_package_dept_id,
+		       p.task_add_flag,
+		       p.create_time,
+		       p.package_type1,
+		       p.user_num,
+		       p.task_num,
+		       p.description,
+		       p.belong_date,
+		       p.score,
+		       d.name packageEntName
 		from wm_score_package p, sys_dept d
 		where (p.send_package_dept_id = d.dept_id and p.package_user_scope = '1'
-		and p.is_receive = '0' and p.enable_flag = '0' and p.enable_type != '2'
+		and p.is_receive = '0' and p.enable_flag = '0' and p.enable_type != '2' and p.source_type = '0'
 		and (SELECT COUNT(1) FROM wm_team WHERE del_flag=0 and enable_flag=0 and dept_id=#{query.deptId} and FIND_IN_SET(#{query.zbId}, member)) = 0
 		<if test="query.scorePackageName != null and query.scorePackageName != ''">
 			AND p.score_package_name like CONCAT('%',#{query.scorePackageName},'%')
@@ -1370,9 +1380,20 @@
 
 	<!-- 积分包结算（分页） -->
 	<select id="listPackageSettleList" resultType="com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageSettleOutput">
-		SELECT p.id, d.name packageEntName, p.score_package_name, p.create_time, p.package_status,
-		p.package_finish_status,
-		p.settle_status,p.invoice_category, p.settle_amount ,p.package_type1, p.score, p.package_type2, p.sub_type
+		SELECT p.id,
+		       d.name packageEntName,
+		       p.score_package_name,
+		       p.create_time,
+		       p.package_status,
+			   p.package_finish_status,
+			   p.settle_status,
+		       p.invoice_category,
+		       p.settle_amount ,
+		       p.package_type1,
+		       p.score,
+		       p.package_type2,
+		       p.sub_type,
+		       p.source_type
 		FROM wm_score_package p, sys_dept d
 		WHERE
 		p.send_package_dept_id = d.dept_id