修復

src/main/java/org/springblade/bank/checklist/service/impl/ChecklistServiceImpl.java

@@ -156,7 +156,7 @@ public class ChecklistServiceImpl extends BaseServiceImpl<ChecklistMapper, Check
 			check_item.forEach(item -> {
 				if (category.getIsSealed().equals(0) && item.getIsSealed().equals(0)){
 					if (category.getDictKey().contains(dataType) && item.getDictKey().contains(dataType) && item.getDictKey().contains(category.getDictKey())){
-						if (!dept.getOrgNo().startsWith("999") && !dept.getOrgNo().equals("51614")){
+						if (!dept.getOrgNo().startsWith("999") && !dept.getDeptCategory().equals(1)){
 							Map row = new HashMap();
 							row.put("orgNo", dept.getOrgNo());
 							row.put("deptName", dept.getDeptName());

src/main/java/org/springblade/bank/goodsuse/controller/GoodsUseController.java

@@ -395,7 +395,7 @@ public class GoodsUseController extends BladeController {
 		Dept dept = deptService.getById(AuthUtil.getDeptId());
 		List<GoodsUse> balanceList = new ArrayList<>();
 		List<Dept> deptList = new ArrayList<>();
-		if (!dept.getOrgNo().startsWith("999") && !dept.getOrgNo().equals("51614")){
+		if (!dept.getOrgNo().startsWith("999") && !dept.getDeptCategory().equals(1)){
 			deptList.add(dept);
 		}
 		List<Dept> deptChild = deptService.getDeptChild(dept.getId());

src/main/java/org/springblade/bank/keypwd/controller/KeyPwdController.java

@@ -40,6 +40,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
@@ -153,6 +154,13 @@ public class KeyPwdController extends BladeController {
 		HashSet<Map> set = new HashSet<>();
 		for (int i = 0; i < list.size(); i++) {
 			KeyPwd item = list.get(i);
+			String[] split = item.getCategory().split(",");
+			//去掉多选的，因为在确认的时候，多选的已经分解了
+			if (split.length > 1){
+				list.remove(i);
+				i--;
+				continue;
+			}
 			HashMap<String, Object> map = new HashMap<>();
 			map.put("bankNo", item.getBankNo());
 			map.put("orgNo", item.getOrgNo());
@@ -178,6 +186,20 @@ public class KeyPwdController extends BladeController {
 		keyPwd.setProcess(3);
 		keyPwd.setSureTime(DateUtil.now());
 		if (keyPwdService.updateById(keyPwd)){
+
+			String[] split = keyPwd.getCategory().split(",");
+			//分解保存，status=2做标识，pid为分解记录的原id
+			if (split.length > 1){
+				for (int i = 0; i < split.length; i++) {
+					@Valid KeyPwd clone = BeanUtil.clone(keyPwd);
+					clone.setId(null);
+					clone.setPid(keyPwd.getId());
+					clone.setCategory(split[i]);
+					clone.setStatus(2);
+					keyPwdService.save(clone);
+				}
+			}
+
 			User user = userService.getById(AuthUtil.getUserId());
 			Dept dept = deptService.getById(user.getDeptId());
 
@@ -236,6 +258,12 @@ public class KeyPwdController extends BladeController {
 		}
 
 		if (keyPwdService.saveOrUpdate(keyPwd)){
+			User receiver = userService.getById(keyPwd.getReceiverId());
+			if (!keyPwd.getCreateDept().equals(Long.valueOf(receiver.getDeptId()))){
+				keyPwd.setCreateDept(Long.valueOf(receiver.getDeptId()));
+				keyPwdService.updateById(keyPwd);
+			}
+
 			userLog.setTableName("keypwd");
 			userLog.setBankNo(dept.getBankNo());
 			userLog.setOrgNo(dept.getOrgNo());

src/main/java/org/springblade/bank/keypwd/entity/KeyPwd.java

@@ -156,5 +156,6 @@ public class KeyPwd extends BaseEntity {
 		@ApiModelProperty(value = "是否上繳至上級單位")
 		private Integer isTurnIn;
 
+		private Long pid;
 
 }

src/main/java/org/springblade/bank/keypwd/mapper/KeyPwdMapper.xml

@@ -32,6 +32,7 @@
         <result column="handover_person_id" property="handoverPersonId"/>
         <result column="process" property="process"/>
         <result column="sure_time" property="sureTime"/>
+        <result column="pid" property="pid"/>
     </resultMap>
 
 
@@ -54,6 +55,9 @@
 
 
         <if test="keyPwd!=null">
+            <if test="keyPwd.status!=null">
+                AND c.status = '${keyPwd.status}'
+            </if>
             <if test="keyPwd.createUser!=null">
                 AND c.create_user like '%${keyPwd.createUser}%'
             </if>

src/main/java/org/springblade/bank/keypwd/service/impl/KeyPwdServiceImpl.java

@@ -41,6 +41,7 @@ public class KeyPwdServiceImpl extends BaseServiceImpl<KeyPwdMapper, KeyPwd> imp
 
 	@Override
 	public IPage<KeyPwdVO> selectKeyPwdPage(IPage<KeyPwdVO> page, KeyPwdVO keyPwd) {
+		keyPwd.setStatus(1);
 		return page.setRecords(baseMapper.selectKeyPwdPage(page, keyPwd));
 	}
 

src/main/java/org/springblade/common/utils/hangxin/HangxinUtil.java

@@ -28,14 +28,14 @@ public class HangxinUtil {
 	private HangxinConfig hangxinConfig;
 
 
-	public HangxinResultBean sendMsg (List<String> userIds, String title, String content){
+	public HangxinResultBean sendMsg (List<String> userEhrs, String title, String content){
 		RestTemplate restTemplate = new RestTemplate();
 		String url = hangxinConfig.getUrl() + HangxinConstants.SEND_MSG;
 		HttpHeaders headers = createHttpHeaders();
 
 		Map<String, Object> params = new HashMap<>();
-		params.put("touser", StringUtil.join(userIds, "|"));
-		params.put("sysid", hangxinConfig.getSysid());
+		params.put("touser", StringUtil.join(userEhrs, "|"));
+		params.put("sysid", hangxinConfig.getSysid() + "|text");
 		params.put("title", title);
 		params.put("content", content);
 

src/main/java/org/springblade/modules/desk/controller/NoticeController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.modules.desk.controller;
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSort;
@@ -23,6 +24,8 @@ import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import org.springblade.bank.postchange.vo.PostChangeVO;
 import org.springblade.common.cache.SysCache;
+import org.springblade.common.utils.hangxin.HangxinUtil;
+import org.springblade.common.utils.hangxin.bean.HangxinResultBean;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.datascope.annotation.DataAuth;
 import org.springblade.core.datascope.enums.DataScopeEnum;
@@ -66,6 +69,8 @@ public class NoticeController extends BladeController {
 	private final INoticeService noticeService;
 	private final IUserService userService;
 
+	private HangxinUtil hangxinUtil;
+
 	/**
 	 * 详情
 	 */
@@ -248,7 +253,6 @@ public class NoticeController extends BladeController {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "已讀記錄", notes = "传入notice")
 	public R setAllHadRead() {
-
 		List<Notice> list = noticeService.selectMyNoticeAll();
 
 		list.forEach(notice -> {
@@ -261,6 +265,19 @@ public class NoticeController extends BladeController {
 		return R.status(noticeService.updateBatchById(list));
 	}
 
+	/**
+	 * test
+	 */
+	@PostMapping("/testNotice")
+	@ApiOperationSupport(order = 10)
+	@ApiOperation(value = "test", notes = "传入mocode")
+	public R testNotice(@ApiParam(value = "主键集合") @RequestParam String mocode) {
+		List<String> ehrList = Func.toStrList("4661465,0150118");
+		String title = "test-有關 （副本認證章13） 的交接登記已於2021-10-22完成；交出人：張三；接收人：李4 業務印章交接登記表";
+		HangxinResultBean hangxinResultBean = hangxinUtil.sendMsg(ehrList, "提示進度", title);
+		System.out.println(JSONUtil.toJsonStr(hangxinResultBean));
+		return R.data(hangxinResultBean);
+	}
 
 
 }

src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java

@@ -266,6 +266,7 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 		List<String> roleIds = roleList.stream().map(role -> role.getId()+"").collect(Collectors.toList());
 		List<User> users = userService.getUsersByDeptIdsRoleIds(deptIds, roleIds);
 		List<String> userIds = users.stream().map(user -> user.getId() + "").collect(Collectors.toList());
+		List<String> userEhrs = users.stream().map(user -> user.getEhr() + "").collect(Collectors.toList());
 		List<String> userNames = users.stream().map(user -> user.getName() + "").collect(Collectors.toList());
 		if (users.size() > 0){
 			System.out.println(dept.getDeptName() + ":" + StringUtil.join(userNames));
@@ -287,8 +288,8 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 		notice.setTargetIds(StringUtil.join(userIds));
 
 		// 發送行信通知
-		/*HangxinResultBean hangxinResultBean = hangxinUtil.sendMsg(userIds, "提示進度", title);
-		System.out.println(JSONUtil.toJsonStr(hangxinResultBean));*/
+		HangxinResultBean hangxinResultBean = hangxinUtil.sendMsg(userEhrs, "提示進度", title);
+		System.out.println(JSONUtil.toJsonStr(hangxinResultBean));
 		return sendNotice(notice);
 //		return true;
 	}

src/main/java/org/springblade/modules/systemexpand/controller/ExpandController.java

@@ -93,7 +93,7 @@ public class ExpandController extends BladeController {
 	public R getChildsDept() {
 		Dept dept = deptService.getById(AuthUtil.getDeptId());
 		List<Dept> list = new ArrayList<>();
-		if (!dept.getOrgNo().startsWith("999") && !dept.getOrgNo().equals("51614")){
+		if (!dept.getOrgNo().startsWith("999") && !dept.getDeptCategory().equals(1)){
 			list.add(dept);
 		}
 		List<Dept> deptChild = deptService.getDeptChild(dept.getId());

src/main/java/org/springblade/modules/timer/TimeTask.java

@@ -52,7 +52,7 @@ public class TimeTask extends BladeController {
 	}
 
 	private void checklistTask(String cycle){
-		Dept yybDept = deptService.getByOrgNo("51614");
+		Dept yybDept = deptService.getByOrgNo("51007");
 		//1、每天
 		List<Long> deptChildIds = deptService.getDeptChildIds(yybDept.getId());
 		deptChildIds.forEach(deptId -> {