feat：积分包序号

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

@@ -122,7 +122,7 @@ public class WmScorePackageController {
 	 */
 	@GetMapping(value = "/sn")
 	public R<String> getPkgSn() {
-		return R.ok(pkgSequence.nextNo());
+		return R.ok("PKG" + pkgSequence.nextNo());
 	}
 
 
@@ -2594,11 +2594,14 @@ public class WmScorePackageController {
 		QueryWrapper<WmScorePackage> queryWrapper = Wrappers.<WmScorePackage>query()
 				.eq("p.package_type1", packageType1)
 				.eq("p.package_type2", packageType2)
-				.like(StrUtil.isNotBlank(scorePackageName), "p.score_package_name", scorePackageName)
 				.eq(scorePackageStatus != null, "p.score_package_status", scorePackageStatus)
 				.eq("p.send_package_dept_id", sendDeptId)
 				.between(start != null && end != null, "p.create_time", start, end);
 
+		if (StrUtil.isNotBlank(scorePackageName)){
+			queryWrapper.like( "p.score_package_name", scorePackageName).or().like( "p.pkg_sn", scorePackageName);
+		}
+
 		if (StringUtil.isEmpty(typeId)) {
 			queryWrapper.in("p.typeid", "3", "4");
 		} else {
@@ -2804,6 +2807,10 @@ public class WmScorePackageController {
 			}
 		}
 
+		if (StrUtil.isBlank(wmScorePackage.getPackageSn())){
+			return R.failed("积分包序列号必填");
+		}
+
 		if (StrUtil.isNotBlank(wmScorePackage.getSubjectLocation())) {
 			SubjectLocation location = Enum.valueOf(SubjectLocation.class, wmScorePackage.getSubjectLocation());
 			wmScorePackage.setLocation(location);

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

@@ -60,6 +60,12 @@ public class WmScorePackage extends Model<WmScorePackage> {
 	@ApiModelProperty(value = "药企ID")
 	private String drugEntId;
 
+	/**
+	 * 积分包序列号
+	 */
+	@TableField(value = "pkg_sn")
+	private String packageSn;
+
 	/**
 	 * 药企ID
 	 */

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

@@ -66,4 +66,6 @@ public class WmScorePackageApiOutput {
 	 */
 	private LocalDateTime notifyTime;
 
+	private String packageSn;
+
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -605,15 +605,15 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 	@Transactional(rollbackFor = Exception.class)
 	public R addWmScorePackage(WmScorePackage wmScorePackage) {
 		HnqzUser currentUser = SecurityUtils.getUser();
-		//判断名字不能重复
+		//判断名字不能重复和积分包序列号不能重复
 		if (null != wmScorePackage.getScorePackageName() && !"".equals(wmScorePackage.getScorePackageName())) {
 			WmScorePackage wmScorePackage1 = new WmScorePackage();
 			wmScorePackage1.setDelFlag("0");
 			wmScorePackage1.setDeptId(currentUser.getDeptId() + "");
 			wmScorePackage1.setScorePackageName(wmScorePackage.getScorePackageName());
-			List<WmScorePackage> wmScorePackageList = this.list(Wrappers.query(wmScorePackage1));
+			List<WmScorePackage> wmScorePackageList = this.list(Wrappers.<WmScorePackage>lambdaQuery(wmScorePackage1).or().eq(WmScorePackage::getPackageSn, wmScorePackage.getPackageSn()));
 			if (wmScorePackageList.size() > 0) {
-				return R.failed("积分包名称已存在");
+				return R.failed("积分包名称或积分包序列号已存在");
 			}
 		}
 		if (wmScorePackage.getPackageType1().equals("1")) {//定额
@@ -1489,10 +1489,6 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
 	@Override
 	public IPage<WmScorePackageApiOutput> getPackageListForReceive(Page page, WmScorePackage wmScorePackage) {
-//		OrderItem orderItem = new OrderItem();
-//		orderItem.setColumn("create_time");
-//		orderItem.setAsc(false);
-//		page.addOrder(orderItem);
 		return wmScorePackageMapper.getPackageListForReceive(page, wmScorePackage);
 	}
 

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

@@ -1273,6 +1273,7 @@
 		       p.task_num,
 		       p.description,
 		       p.belong_date,
+		       p.pkg_sn AS `packageSn`,
 		       p.score,
 		       d.name packageEntName
 		from wm_score_package p, sys_dept d
@@ -1280,7 +1281,7 @@
 		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},'%')
+			AND (p.score_package_name like CONCAT('%',#{query.scorePackageName},'%') OR p.pkg_sn like CONCAT('%',#{query.scorePackageName},'%')
 		</if>
 		<if test="query.belongDate != null and query.belongDate != ''">
 			AND p.belong_date= #{query.belongDate}

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

@@ -100,14 +100,14 @@
 
 	<select id="getReceivedPackageList" resultType="com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageApiOutput">
 		SELECT s.enable_flag, s.id statusId, p.id, p.score_package_name, p.send_package_dept_id, s.task_add_flag,
-		p.create_time, p.package_type1, p.user_num, p.task_num, p.description, p.belong_date,
+		p.create_time, p.package_type1, p.user_num, p.task_num, p.description, p.belong_date, p.pkg_sn as `packageSn`
 		p.score, s.enable_type, s.status, s.task_num taskNum2 , s.create_time receiveTime, d.name packageEntName
 		FROM
 		wm_score_package_status s, wm_score_package p , sys_dept d
 		WHERE s.package_id = p.id AND p.send_package_dept_id = d.dept_id
 		AND s.del_flag = '0'
 		<if test="query.scorePackageName != null and query.scorePackageName != ''">
-			AND p.score_package_name like CONCAT('%',#{query.scorePackageName},'%')
+			AND p.score_package_name like CONCAT('%',#{query.scorePackageName},'%') OR p.pkg_sn like CONCAT('%',#{query.scorePackageName},'%')
 		</if>
 		<if test="query.selDate != null and query.selDate != ''">
 			AND p.belong_date= #{query.selDate}