wk/mdc_wk.git - Gitblit

			@@ -47,6 +47,7 @@
			import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.stereotype.Service;

			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			@@ -96,6 +97,9 @@

			@Resource
			private ISysUserService sysUserService;

			@Value("${wechatEnterprise.cardActionUrl}")
			private String cardActionUrl;

			/**
			* 分页列表
			@@ -232,6 +236,7 @@
			String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.REPAIR_ORDER_CODE_RULE);
			eamRepairOrder.setRepairCode(codeSeq);
			EamReportRepair eamReportRepair = eamReportRepairService.getById(eamReportRepairQuery.getId());
			eamRepairOrder.setReportId(eamReportRepairQuery.getId());
			eamRepairOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
			eamRepairOrder.setEquipmentId(eamReportRepair.getEquipmentId());
			eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_REPAIR.name());
			@@ -376,7 +381,7 @@

			TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
			cardAction.setType(1);
			cardAction.setUrl("http://houjie.xalxzn.com:8866/h5");
			cardAction.setUrl(cardActionUrl);
			templateCardEntity.setCard_action(cardAction);

			wechatEnterpriseService.sendTemplateCardMsg(templateCard, true);
			@@ -444,7 +449,11 @@
			values.put("dataId", eamRepairOrder.getId());
			values.put("organization", "维修工单进入等备件状态");
			values.put("comment", "维修工单进入等备件状态");
			values.put("NextAssignee", Arrays.asList(equipment.getEquipmentManager().split(",")));
			//values.put("NextAssignee", equipment.getEquipmentManager().split(","));
			//设备台账表维护的设备管理员工号是带 WK前缀的
			values.put("NextAssignee", Arrays.stream(equipment.getEquipmentManager().split(","))
			.map(s -> s.substring(2))
			.collect(Collectors.toList()));
			values.put("status", 1);
			request.setComment("维修工单进入等备件状态");
			eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_SPARES.name());