Merge remote-tracking branch 'origin/temp-pre' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/config/UpmsConfig.java

@@ -46,7 +46,7 @@ public class UpmsConfig {
 
 	private Integer tagId;
 
-	private Map<String, Long> custMeetingTimes;
+	private Map<Integer, Long> custMeetingTimes;
 
 
 }

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

@@ -74,6 +74,7 @@ import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 
@@ -113,10 +114,17 @@ public class WmScorePackageController {
 	@PutMapping(value = "/p2p/amount")
 	@Transactional(rollbackFor = Exception.class)
 	public R<?> saveP2pAmount(@RequestBody WmScorePackage wmScorePackage) {
-		if (StrUtil.isBlank(wmScorePackage.getId()) || wmScorePackage.getP2pAmount() == null) {
+		if (StrUtil.isBlank(wmScorePackage.getId()) || wmScorePackage.getP2pAmount() == null || wmScorePackage.getP2pDraft() == null) {
 			return R.failed("参数错误");
 		}
 
+		// 如果是草稿，放入缓存
+		if (wmScorePackage.getP2pDraft()){
+			redisTemplate.opsForValue().set(String.format("scorepackage:p2p:amount:%s", wmScorePackage.getId()), wmScorePackage.getP2pAmount().toString(), 180, TimeUnit.DAYS);
+			redisTemplate.opsForValue().set(String.format("scorepackage:p2p:desc:%s", wmScorePackage.getId()), wmScorePackage.getDescription(), 180, TimeUnit.DAYS);
+			return R.ok();
+		}
+
 		WmScorePackage sp = new WmScorePackage();
 		sp.setId(wmScorePackage.getId());
 		sp.setP2pAmount(wmScorePackage.getP2pAmount());
@@ -134,7 +142,7 @@ public class WmScorePackageController {
 	 */
 	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping("/page")
-	public R getWmScorePackagePage(Page page, WmScorePackage wmScorePackage) {
+	public R<?> getWmScorePackagePage(Page<WmScorePackage> page, WmScorePackage wmScorePackage) {
 
 		OrderItem orderItem = new OrderItem();
 		orderItem.setColumn("create_time");
@@ -186,8 +194,23 @@ public class WmScorePackageController {
 			}
 		}
 
+		wmScorePackageService.page(page, queryWrapper);
+		page.getRecords().forEach(r -> {
+			if (r.getP2pAmount() != null){
+				r.setP2pDraft(false);
+			} else {
+				String s = redisTemplate.opsForValue().get(String.format("scorepackage:p2p:amount:%s", r.getId()));
+				String desc = redisTemplate.opsForValue().get(String.format("scorepackage:p2p:desc:%s", r.getId()));
+				if (StrUtil.isNotBlank(s)){
+					r.setP2pAmount(new BigDecimal(s));
+					r.setDescription(desc);
+				}
+				r.setP2pDraft(true);
+			}
 
-		return R.ok(wmScorePackageService.page(page, queryWrapper));
+		});
+
+		return R.ok(page);
 	}
 
 
@@ -670,6 +693,22 @@ public class WmScorePackageController {
 			ext.setReportMqName(CacheConstants.EXPORT_NBA_REPORT_CACHE);
 			wmScorePackageService.getReportOpt(ext);
 		}
+
+		page1.getRecords().forEach(r -> {
+			if (r.getP2pAmount() != null){
+				r.setP2pDraft(false);
+			} else {
+				String s = redisTemplate.opsForValue().get(String.format("scorepackage:p2p:amount:%s", r.getId()));
+				String desc = redisTemplate.opsForValue().get(String.format("scorepackage:p2p:desc:%s", r.getId()));
+				if (StrUtil.isNotBlank(s)){
+					r.setP2pAmount(new BigDecimal(s));
+					r.setDescription(desc);
+				}
+				r.setP2pDraft(true);
+			}
+
+		});
+
 		return R.ok(page1);
 	}
 
@@ -1418,6 +1457,19 @@ public class WmScorePackageController {
 		try {
 			for (Future<WmScorePackage> future : futureList) {
 				WmScorePackage wmScorePackage = future.get();
+
+				if (wmScorePackage.getP2pAmount() != null){
+					wmScorePackage.setP2pDraft(false);
+				} else {
+					String s = redisTemplate.opsForValue().get(String.format("scorepackage:p2p:amount:%s", wmScorePackage.getId()));
+					String desc = redisTemplate.opsForValue().get(String.format("scorepackage:p2p:desc:%s", wmScorePackage.getId()));
+					if (StrUtil.isNotBlank(s)){
+						wmScorePackage.setP2pAmount(new BigDecimal(s));
+						wmScorePackage.setDescription(desc);
+					}
+					wmScorePackage.setP2pDraft(true);
+				}
+
 				finalRecords.add(wmScorePackage);
 
 			}
@@ -1448,9 +1500,10 @@ public class WmScorePackageController {
 
 		List<Map<String, Object>> answerList = new ArrayList<>();
 		if (wmId.getLevel() == 3) {
+			int deptId = SecurityUtils.getUser().getDeptId();
 			for (WmScorePackage wmScorePackage1 : list) {
 				Map<String, Object> map1 = new HashMap<>();
-				if (SecurityUtils.getUser().getDeptId().equals(Integer.valueOf(wmScorePackage1.getDeptId()))) {
+				if (StrUtil.isNotBlank(wmScorePackage1.getDeptId()) && deptId == Integer.parseInt(wmScorePackage1.getDeptId())) {
 					map1.put("relationScoreId", wmScorePackage1.getId());
 					map1.put("scorePackageName", wmScorePackage1.getScorePackageName());
 					answerList.add(map1);

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

@@ -509,6 +509,9 @@ public class WmScorePackage extends Model<WmScorePackage> {
 	@TableField(value = "p2p_amount")
 	public BigDecimal p2pAmount;
 
+	@TableField(exist = false)
+	public Boolean p2pDraft;
+
 	/**
 	 * 关联药品的生产厂商列表
 	 */

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

@@ -135,7 +135,7 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 		WmScorePackageStatus scorePackageStatus = statusList.get(0);
 		long defMeetingTaskCount = 2L;
 
-		Map<String, Long> custMeetingTimes = upmsConfig.getCustMeetingTimes();
+		Map<Integer, Long> custMeetingTimes = upmsConfig.getCustMeetingTimes();
 		log.warn("会议类型限制：{}", custMeetingTimes);
 		if (CollUtil.isNotEmpty(custMeetingTimes)){
 			Long times = custMeetingTimes.get(user.getDeptId());
@@ -156,7 +156,7 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 			long meetingTaskCount = wmTaskService.countMeetingTask(CollectionUtil.toList("1", "2", "3", "4"),
 							String.valueOf(sysU.getUserId()), start, end);
 			log.info("会议举办次数：{}", meetingTaskCount);
-			if (meetingTaskCount >= defMeetingTaskCount) {
+			if (meetingTaskCount >= 2L) {
 				return R.failed(1, "每天最多举办两场会议");
 			}
 
@@ -183,7 +183,7 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 					String.valueOf(sysU.getUserId()), start, end);
 			log.info("一对一专访次数：{}", meetingTaskCount);
 			if (meetingTaskCount >= defMeetingTaskCount) {
-				return R.failed(1, "每天最多举办两场一对一专访");
+				return R.failed(1, "每天最多举办"+ defMeetingTaskCount +"场一对一专访");
 			}
 
 			//会议类型
@@ -208,7 +208,7 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 			long meetingTaskCount = wmTaskService.countMeetingTask(CollectionUtil.toList("34", "35", "36", "37"),
 					String.valueOf(sysU.getUserId()), start, end);
 			log.info("培训次数：{}", meetingTaskCount);
-			if (meetingTaskCount >= defMeetingTaskCount) {
+			if (meetingTaskCount >= 2L) {
 				return R.failed(1, "每天最多举办两场培训");
 			}
 

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

@@ -125,13 +125,43 @@
 	</select>
 
 	<select id="listWmScorePackageAndTaskExt" resultMap="wmScorePackageMap">
-		select id, task_rule_id, drug_ent_id, score_id, score_name, score, agent_type_id, level1_id, level2_id,
-		zb_id,score_package_status,settlement_date,
-		xxdb_id, typeid, package_finish_status, dept_id, del_flag, enable_flag, tenant_id, create_time,
-		create_user,send_package_dept_id,old_package,
-		update_time,
-		update_user,belong_date,allocation_date,score_package_name,package_type1,relation_score_id,ywctt,settle_status,finish_rate
-		,bb.ytj,bb.ysh,bb.dsh from wm_score_package LEFT JOIN (
+		select id,
+		       task_rule_id,
+		       drug_ent_id,
+		       score_id,
+		       score_name,
+		       score,
+		       agent_type_id,
+		       level1_id, level2_id,
+		       zb_id,
+		       score_package_status,
+		       settlement_date,
+		       xxdb_id,
+		       typeid,
+		       package_finish_status,
+		       dept_id,
+		       del_flag,
+		       enable_flag,
+		       tenant_id,
+		       create_time,
+		       create_user,
+		       send_package_dept_id,
+		       old_package,
+		       update_time,
+			   update_user,
+		       belong_date,
+		       allocation_date,
+		       score_package_name,
+		       package_type1,
+		       relation_score_id,
+		       ywctt,
+		       settle_status,
+		       finish_rate,
+		       p2p_amount,
+		       bb.ytj,
+		       bb.ysh,
+		       bb.dsh
+		from wm_score_package LEFT JOIN (
 		select score_package_id,sum(if(task_status>0,score,0)) ytj,sum(if(task_status=3,score,0))
 		ysh,sum(if(task_status=2,score,0)) dsh from wm_task where score_package_id is not null and wm_task.del_flag=0
 		and wm_task.enable_flag=0 group by score_package_id)
@@ -259,7 +289,7 @@
 		zb_id,score_package_status,settlement_date,
 		xxdb_id, typeid, package_finish_status, dept_id, del_flag, enable_flag, tenant_id, create_time,
 		create_user,send_package_dept_id,old_package,
-		update_time,
+		update_time,p2p_amount,
 		update_user,belong_date,allocation_date,score_package_name,package_type1,relation_score_id,ywctt,settle_status,finish_rate
 		,bb.ytj,bb.ysh,bb.dsh from wm_score_package LEFT JOIN (
 		select score_package_id,sum(if(task_status>0,score,0)) ytj,sum(if(task_status=3,score,0))