服务指令考核

nursing-unit-api/src/main/java/com/nu/modules/wechat/pay/api/WeChatPayApi.java

@@ -219,7 +219,8 @@ public class WeChatPayApi {
                 mqDto.setOrgCode(orderData.getOrgCode());
                 rabbitMQUtil.sendToExchange("hldy.nubaseelder", "hldy.nubaseelder.bindnu", mqDto);
             }
-
+            //支付完成清理不可绑定状态
+            redisUtil.del("binding_nu_paying"+orderData.getNuId());
         }
         Date now = new Date();
         systemOrderApiEntity.setNotifyCount(orderData.getNotifyCount() + 1);//回执次数

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/controller/DirectiveAppraisalController.java

@@ -8,22 +8,22 @@ import com.nu.modules.biz.appraisal.service.IDirectiveAppraisalService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
+import org.jeecg.common.system.vo.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description: 护理单元-服务指令-工单
@@ -67,6 +67,7 @@ public class DirectiveAppraisalController extends JeecgController<DirectiveAppra
         customeRuleMap.put("categoryId", QueryRuleEnum.LIKE_WITH_OR);
         customeRuleMap.put("typeId", QueryRuleEnum.LIKE_WITH_OR);
         customeRuleMap.put("optType", QueryRuleEnum.LIKE_WITH_OR);
+        customeRuleMap.put("optNames", QueryRuleEnum.LIKE_WITH_OR);
         customeRuleMap.put("optStatus", QueryRuleEnum.LIKE_WITH_OR);
         customeRuleMap.put("status", QueryRuleEnum.LIKE_WITH_OR);
         QueryWrapper<DirectiveAppraisal> queryWrapper = QueryGenerator.initQueryWrapper(directiveAppraisal, customParamMap, customeRuleMap);
@@ -177,4 +178,23 @@ public class DirectiveAppraisalController extends JeecgController<DirectiveAppra
         return super.importExcel(request, response, DirectiveAppraisal.class);
     }
 
+    /**
+     * 撤回
+     *
+     * @param directiveAppraisal
+     * @return
+     */
+    @AutoLog(value = "护理单元-服务指令-工单-撤回")
+    @ApiOperation(value = "护理单元-服务指令-工单-撤回", notes = "护理单元-服务指令-工单-撤回")
+    @RequestMapping(value = "/revocation", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> revocation(@RequestBody DirectiveAppraisal directiveAppraisal) {
+        DirectiveAppraisal upData = new DirectiveAppraisal();
+        upData.setId(directiveAppraisal.getId());
+        upData.setStatus("4");
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        upData.setRevocation(sysUser.getRealname());//撤回人
+        upData.setRevocationTime(new Date());//撤回时间
+        directiveAppraisalService.updateById(upData);
+        return Result.OK("操作成功!");
+    }
 }

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/entity/DirectiveAppraisal.java

@@ -1,8 +1,6 @@
 package com.nu.modules.biz.appraisal.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,6 +11,7 @@ import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.persistence.Column;
 import java.io.Serializable;
 
 /**
@@ -92,6 +91,7 @@ public class DirectiveAppraisal implements Serializable {
 	/**服务属性  ds定时 js计时*/
 	@Excel(name = "服务属性  ds定时 js计时", width = 15)
     @ApiModelProperty(value = "服务属性  ds定时 js计时")
+	@Dict(dicCode = "service_attribute")
     private java.lang.String serviceAttribute;
 	/**服务类型名称*/
 	@Excel(name = "服务类型名称", width = 15)
@@ -154,9 +154,9 @@ public class DirectiveAppraisal implements Serializable {
     @ApiModelProperty(value = "是否是服务指令包 Y是 N否")
     private java.lang.String izPackage;
 	/**开始时间*/
-	@Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd")
+	@Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "开始时间")
     private java.util.Date startTime;
 	/**结束时间*/
@@ -232,7 +232,7 @@ public class DirectiveAppraisal implements Serializable {
     @ApiModelProperty(value = "实际执行人名称（多个）； 主要执行人+协助人")
     private java.lang.String optNames;
 	/**审核状态 0待审核 1通过 2未通过*/
-	@Excel(name = "审核状态 0待审核 1通过 2未通过", width = 15, dicCode = "appraisal_status")
+	@Excel(name = "审核状态 1待审核 2通过 3未通过", width = 15, dicCode = "appraisal_status")
 	@Dict(dicCode = "appraisal_status")
     @ApiModelProperty(value = "审核状态 0待审核 1通过 2未通过")
     private java.lang.String status;
@@ -243,11 +243,18 @@ public class DirectiveAppraisal implements Serializable {
 	/**撤回人（汉字）*/
 	@Excel(name = "撤回人（汉字）", width = 15)
     @ApiModelProperty(value = "撤回人（汉字）")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	@Column(nullable = true, updatable = true)
     private java.lang.String revocation;
 	/**撤回时间*/
 	@Excel(name = "撤回时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "撤回时间")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	@Column(nullable = true, updatable = true)
     private java.util.Date revocationTime;
+
+	@TableField(exist = false)
+	private String queryStatus;
 }