模块信息维护

src/main/java/com/diagbot/dto/ModifyPasswordVO.java

@@ -0,0 +1,16 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 修改密码参数
+ * @Author: ztg
+ * @Date: 2018/9/28 13:14
+ */
+@Getter
+@Setter
+public class ModifyPasswordVO {
+    private String password; //原密码
+    private String modifyPassword; //新密码
+}

src/main/java/com/diagbot/dto/QcCasesDTO.java

@@ -30,7 +30,7 @@ public class QcCasesDTO {
     private LocalDateTime gmtModified;
 
     /**
-     * 病历
+     * 模块名称
      */
     private String name;
 

src/main/java/com/diagbot/entity/BasHospitalInfo.java

@@ -2,8 +2,9 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -66,12 +67,12 @@ public class BasHospitalInfo implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -95,6 +96,7 @@ public class BasHospitalInfo implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getName() {
         return name;
     }
@@ -102,6 +104,7 @@ public class BasHospitalInfo implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
+
     public String getCode() {
         return code;
     }
@@ -109,6 +112,7 @@ public class BasHospitalInfo implements Serializable {
     public void setCode(String code) {
         this.code = code;
     }
+
     public String getSpell() {
         return spell;
     }
@@ -116,6 +120,7 @@ public class BasHospitalInfo implements Serializable {
     public void setSpell(String spell) {
         this.spell = spell;
     }
+
     public String getAddress() {
         return address;
     }
@@ -123,6 +128,7 @@ public class BasHospitalInfo implements Serializable {
     public void setAddress(String address) {
         this.address = address;
     }
+
     public Integer getStatus() {
         return status;
     }
@@ -130,6 +136,7 @@ public class BasHospitalInfo implements Serializable {
     public void setStatus(Integer status) {
         this.status = status;
     }
+
     public Integer getOrderNo() {
         return orderNo;
     }
@@ -137,6 +144,7 @@ public class BasHospitalInfo implements Serializable {
     public void setOrderNo(Integer orderNo) {
         this.orderNo = orderNo;
     }
+
     public Integer getConnect() {
         return connect;
     }
@@ -144,6 +152,7 @@ public class BasHospitalInfo implements Serializable {
     public void setConnect(Integer connect) {
         this.connect = connect;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -151,20 +160,23 @@ public class BasHospitalInfo implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -172,6 +184,7 @@ public class BasHospitalInfo implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -179,6 +192,7 @@ public class BasHospitalInfo implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public String getRemark() {
         return remark;
     }
@@ -190,20 +204,20 @@ public class BasHospitalInfo implements Serializable {
     @Override
     public String toString() {
         return "BasHospitalInfo{" +
-            "id=" + id +
-            ", name=" + name +
-            ", code=" + code +
-            ", spell=" + spell +
-            ", address=" + address +
-            ", status=" + status +
-            ", orderNo=" + orderNo +
-            ", connect=" + connect +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", name=" + name +
+                ", code=" + code +
+                ", spell=" + spell +
+                ", address=" + address +
+                ", status=" + status +
+                ", orderNo=" + orderNo +
+                ", connect=" + connect +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", remark=" + remark +
+                "}";
     }
 }

src/main/java/com/diagbot/entity/QcCases.java

@@ -2,8 +2,9 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -24,7 +25,7 @@ public class QcCases implements Serializable {
     private Long id;
 
     /**
-     * 病历
+     * 模块名称
      */
     private String name;
 
@@ -51,12 +52,12 @@ public class QcCases implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -75,6 +76,7 @@ public class QcCases implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getName() {
         return name;
     }
@@ -82,6 +84,7 @@ public class QcCases implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
+
     public String getPrefix() {
         return prefix;
     }
@@ -89,6 +92,7 @@ public class QcCases implements Serializable {
     public void setPrefix(String prefix) {
         this.prefix = prefix;
     }
+
     public Integer getOrderNo() {
         return orderNo;
     }
@@ -96,6 +100,7 @@ public class QcCases implements Serializable {
     public void setOrderNo(Integer orderNo) {
         this.orderNo = orderNo;
     }
+
     public String getRemark() {
         return remark;
     }
@@ -103,6 +108,7 @@ public class QcCases implements Serializable {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -110,20 +116,23 @@ public class QcCases implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -131,6 +140,7 @@ public class QcCases implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -142,16 +152,16 @@ public class QcCases implements Serializable {
     @Override
     public String toString() {
         return "QcCases{" +
-            "id=" + id +
-            ", name=" + name +
-            ", prefix=" + prefix +
-            ", orderNo=" + orderNo +
-            ", remark=" + remark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
+                "id=" + id +
+                ", name=" + name +
+                ", prefix=" + prefix +
+                ", orderNo=" + orderNo +
+                ", remark=" + remark +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                "}";
     }
 }

src/main/java/com/diagbot/entity/QcCasesHospital.java

@@ -1,14 +1,15 @@
 package com.diagbot.entity;
 
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author gaodm
@@ -44,12 +45,12 @@ public class QcCasesHospital implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -68,6 +69,7 @@ public class QcCasesHospital implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public Long getHospitalId() {
         return hospitalId;
     }
@@ -75,6 +77,7 @@ public class QcCasesHospital implements Serializable {
     public void setHospitalId(Long hospitalId) {
         this.hospitalId = hospitalId;
     }
+
     public Long getCasesId() {
         return casesId;
     }
@@ -82,6 +85,7 @@ public class QcCasesHospital implements Serializable {
     public void setCasesId(Long casesId) {
         this.casesId = casesId;
     }
+
     public BigDecimal getScore() {
         return score;
     }
@@ -89,6 +93,7 @@ public class QcCasesHospital implements Serializable {
     public void setScore(BigDecimal score) {
         this.score = score;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -96,20 +101,23 @@ public class QcCasesHospital implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -117,6 +125,7 @@ public class QcCasesHospital implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -128,15 +137,15 @@ public class QcCasesHospital implements Serializable {
     @Override
     public String toString() {
         return "QcCasesHospital{" +
-            "id=" + id +
-            ", hospitalId=" + hospitalId +
-            ", casesId=" + casesId +
-            ", score=" + score +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
+                "id=" + id +
+                ", hospitalId=" + hospitalId +
+                ", casesId=" + casesId +
+                ", score=" + score +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                "}";
     }
 }

src/main/java/com/diagbot/entity/SysDictionaryInfo.java

@@ -2,8 +2,9 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -31,12 +32,12 @@ public class SysDictionaryInfo implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -85,6 +86,7 @@ public class SysDictionaryInfo implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -92,20 +94,23 @@ public class SysDictionaryInfo implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -113,6 +118,7 @@ public class SysDictionaryInfo implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -120,6 +126,7 @@ public class SysDictionaryInfo implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public Long getGroupType() {
         return groupType;
     }
@@ -127,6 +134,7 @@ public class SysDictionaryInfo implements Serializable {
     public void setGroupType(Long groupType) {
         this.groupType = groupType;
     }
+
     public String getName() {
         return name;
     }
@@ -134,6 +142,7 @@ public class SysDictionaryInfo implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
+
     public String getVal() {
         return val;
     }
@@ -141,6 +150,7 @@ public class SysDictionaryInfo implements Serializable {
     public void setVal(String val) {
         this.val = val;
     }
+
     public Integer getReturnType() {
         return returnType;
     }
@@ -148,6 +158,7 @@ public class SysDictionaryInfo implements Serializable {
     public void setReturnType(Integer returnType) {
         this.returnType = returnType;
     }
+
     public Integer getOrderNo() {
         return orderNo;
     }
@@ -155,6 +166,7 @@ public class SysDictionaryInfo implements Serializable {
     public void setOrderNo(Integer orderNo) {
         this.orderNo = orderNo;
     }
+
     public String getRemark() {
         return remark;
     }
@@ -166,18 +178,18 @@ public class SysDictionaryInfo implements Serializable {
     @Override
     public String toString() {
         return "SysDictionaryInfo{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", groupType=" + groupType +
-            ", name=" + name +
-            ", val=" + val +
-            ", returnType=" + returnType +
-            ", orderNo=" + orderNo +
-            ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", groupType=" + groupType +
+                ", name=" + name +
+                ", val=" + val +
+                ", returnType=" + returnType +
+                ", orderNo=" + orderNo +
+                ", remark=" + remark +
+                "}";
     }
 }

src/main/java/com/diagbot/entity/SysMenu.java

@@ -2,8 +2,9 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -31,12 +32,12 @@ public class SysMenu implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -80,6 +81,7 @@ public class SysMenu implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -87,20 +89,23 @@ public class SysMenu implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -108,6 +113,7 @@ public class SysMenu implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -115,6 +121,7 @@ public class SysMenu implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public String getName() {
         return name;
     }
@@ -122,6 +129,7 @@ public class SysMenu implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
+
     public Long getParentId() {
         return parentId;
     }
@@ -129,6 +137,7 @@ public class SysMenu implements Serializable {
     public void setParentId(Long parentId) {
         this.parentId = parentId;
     }
+
     public String getCode() {
         return code;
     }
@@ -136,6 +145,7 @@ public class SysMenu implements Serializable {
     public void setCode(String code) {
         this.code = code;
     }
+
     public Integer getOrderNo() {
         return orderNo;
     }
@@ -143,6 +153,7 @@ public class SysMenu implements Serializable {
     public void setOrderNo(Integer orderNo) {
         this.orderNo = orderNo;
     }
+
     public String getRemark() {
         return remark;
     }
@@ -154,17 +165,17 @@ public class SysMenu implements Serializable {
     @Override
     public String toString() {
         return "SysMenu{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", name=" + name +
-            ", parentId=" + parentId +
-            ", code=" + code +
-            ", orderNo=" + orderNo +
-            ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", name=" + name +
+                ", parentId=" + parentId +
+                ", code=" + code +
+                ", orderNo=" + orderNo +
+                ", remark=" + remark +
+                "}";
     }
 }

src/main/java/com/diagbot/entity/SysUser.java

@@ -1,10 +1,11 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -33,12 +34,12 @@ public class SysUser implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -89,18 +90,18 @@ public class SysUser implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

src/main/java/com/diagbot/facade/QcCasesFacade.java

@@ -1,18 +1,20 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.QcCasesDTO;
-import com.diagbot.entity.QcCasesHospital;
-import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.QcCasesServiceImpl;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.SysUserUtils;
-import com.diagbot.vo.QcCasesPageVO;
+import com.diagbot.vo.QcCasesQueryVO;
 import com.diagbot.vo.QcCasesSaveVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * @Description:
  * @author: gaodm
@@ -24,19 +26,25 @@ public class QcCasesFacade extends QcCasesServiceImpl {
     @Autowired
     private QcCasesHospitalFacade qcCasesHospitalFacade;
 
-    public IPage<QcCasesDTO> getQcCasesFac(QcCasesPageVO qcCasesPageVO){
-        qcCasesPageVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
-        return this.getQcCases(qcCasesPageVO);
+    public List<QcCasesDTO> getQcCasesFac() {
+        QcCasesQueryVO queryVO = new QcCasesQueryVO();
+        queryVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
+        return this.getQcCases(queryVO);
     }
 
-    public Boolean saveQcCases(QcCasesSaveVO qcCasesSaveVO){
-        return qcCasesHospitalFacade.update(new UpdateWrapper<QcCasesHospital>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("id", qcCasesSaveVO.getId())
-                .eq("hospital_id", SysUserUtils.getCurrentHospitalID())
-                .set("score", qcCasesSaveVO.getScore())
-                .set("modifier", SysUserUtils.getCurrentPrincipleID())
-                .set("gmt_modified", DateUtil.now()));
+    public Boolean saveQcCases(List<QcCasesSaveVO> qcCasesSaveVOList) {
+        if (ListUtil.isNotEmpty(qcCasesSaveVOList)) {
+            Date now = DateUtil.now();
+            for (QcCasesSaveVO qcCasesSaveVO : qcCasesSaveVOList) {
+                qcCasesSaveVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
+                qcCasesSaveVO.setModifier(SysUserUtils.getCurrentPrincipleID());
+                qcCasesSaveVO.setGmtModified(now);
+            }
+        } else {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL);
+        }
+        qcCasesHospitalFacade.updateBatch(qcCasesSaveVOList);
+        return true;
 
     }
 }

src/main/java/com/diagbot/facade/SysUserFacade.java

@@ -18,6 +18,7 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.exception.ServiceErrorCode;
 import com.diagbot.service.impl.SysUserServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
@@ -151,6 +152,47 @@ public class SysUserFacade extends SysUserServiceImpl {
         return jwt;
     }
 
+    /**
+     * 修改密码
+     *
+     * @param password       原密码
+     * @param modifyPassword 新密码
+     * @return 修改密码是否成功
+     */
+    public Boolean modifyPassword(String password, String modifyPassword) {
+        if (StringUtil.isBlank(password)) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
+                    "请输入密码");
+        }
+        if (StringUtil.isBlank(modifyPassword)) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
+                    "请输入新密码");
+        }
+        if (password.equals(modifyPassword)) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
+                    "原密码和新密码不能相同");
+        }
+
+        SysUser user = this.getOne(new QueryWrapper<SysUser>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", SysUserUtils.getCurrentPrincipleID()), false);
+        if (null == user) {
+            throw new CommonException(ServiceErrorCode.USER_NOT_FOUND);
+        }
+
+        PasswordEncoder passwordEncoder
+                = PasswordEncoderFactories.createDelegatingPasswordEncoder();
+        if (!passwordEncoder.matches(password, user.getPassword())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "原密码错误");
+        }
+
+        String entryPassword = passwordEncoder.encode(modifyPassword);
+        user.setPassword(entryPassword);
+        user.setGmtModified(DateUtil.now());
+        this.updateById(user);
+        return true;
+    }
+
     /**
      * 登录
      *

src/main/java/com/diagbot/mapper/QcCasesHospitalMapper.java

@@ -2,6 +2,9 @@ package com.diagbot.mapper;
 
 import com.diagbot.entity.QcCasesHospital;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.QcCasesSaveVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2020-04-12
  */
 public interface QcCasesHospitalMapper extends BaseMapper<QcCasesHospital> {
-
+    void updateBatch(List<QcCasesSaveVO> qcCasesSaveVOList);
 }

src/main/java/com/diagbot/mapper/QcCasesMapper.java

@@ -1,10 +1,11 @@
 package com.diagbot.mapper;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diagbot.dto.QcCasesDTO;
 import com.diagbot.entity.QcCases;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.vo.QcCasesPageVO;
+import com.diagbot.vo.QcCasesQueryVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,5 +16,5 @@ import com.diagbot.vo.QcCasesPageVO;
  * @since 2020-04-12
  */
 public interface QcCasesMapper extends BaseMapper<QcCases> {
-    IPage<QcCasesDTO> getQcCases(QcCasesPageVO qcCasesPageVO);
+    List<QcCasesDTO> getQcCases(QcCasesQueryVO queryVO);
 }

src/main/java/com/diagbot/service/QcCasesHospitalService.java

@@ -2,6 +2,9 @@ package com.diagbot.service;
 
 import com.diagbot.entity.QcCasesHospital;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.QcCasesSaveVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2020-04-12
  */
 public interface QcCasesHospitalService extends IService<QcCasesHospital> {
-
+    void updateBatch(List<QcCasesSaveVO> qcCasesSaveVOList);
 }

src/main/java/com/diagbot/service/QcCasesService.java

@@ -1,10 +1,11 @@
 package com.diagbot.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.QcCasesDTO;
 import com.diagbot.entity.QcCases;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.vo.QcCasesPageVO;
+import com.diagbot.vo.QcCasesQueryVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,5 +16,5 @@ import com.diagbot.vo.QcCasesPageVO;
  * @since 2020-04-12
  */
 public interface QcCasesService extends IService<QcCases> {
-    IPage<QcCasesDTO> getQcCases(QcCasesPageVO qcCasesPageVO);
+    List<QcCasesDTO> getQcCases(QcCasesQueryVO queryVO);
 }

src/main/java/com/diagbot/service/impl/QcCasesHospitalServiceImpl.java

@@ -4,8 +4,11 @@ import com.diagbot.entity.QcCasesHospital;
 import com.diagbot.mapper.QcCasesHospitalMapper;
 import com.diagbot.service.QcCasesHospitalService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.QcCasesSaveVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +19,8 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class QcCasesHospitalServiceImpl extends ServiceImpl<QcCasesHospitalMapper, QcCasesHospital> implements QcCasesHospitalService {
-
+    public void updateBatch(List<QcCasesSaveVO> qcCasesSaveVOList){
+        baseMapper.updateBatch(qcCasesSaveVOList);
+        return;
+    }
 }

src/main/java/com/diagbot/service/impl/QcCasesServiceImpl.java

@@ -1,14 +1,15 @@
 package com.diagbot.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.QcCasesDTO;
 import com.diagbot.entity.QcCases;
 import com.diagbot.mapper.QcCasesMapper;
 import com.diagbot.service.QcCasesService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.vo.QcCasesPageVO;
+import com.diagbot.vo.QcCasesQueryVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 病历 服务实现类
@@ -20,7 +21,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class QcCasesServiceImpl extends ServiceImpl<QcCasesMapper, QcCases> implements QcCasesService {
     @Override
-    public IPage<QcCasesDTO> getQcCases(QcCasesPageVO qcCasesPageVO){
-        return baseMapper.getQcCases(qcCasesPageVO);
+    public List<QcCasesDTO> getQcCases(QcCasesQueryVO queryVO) {
+        return baseMapper.getQcCases(queryVO);
     }
 }

src/main/java/com/diagbot/vo/QcCasesPageVO.java

@@ -12,7 +12,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class QcCasesPageVO extends Page {
+public class QcCasesQueryVO {
     /**
      * 医院ID
      */

src/main/java/com/diagbot/vo/QcCasesSaveVO.java

@@ -5,6 +5,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @Description:
@@ -30,4 +31,16 @@ public class QcCasesSaveVO {
      */
     @ApiModelProperty(hidden = true)
     private Long hospitalId;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @ApiModelProperty(hidden = true)
+    private Date gmtModified;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    @ApiModelProperty(hidden = true)
+    private String modifier;
 }

src/main/java/com/diagbot/web/QcCasesController.java

@@ -1,11 +1,9 @@
 package com.diagbot.web;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.QcCasesDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.QcCasesFacade;
-import com.diagbot.vo.QcCasesPageVO;
 import com.diagbot.vo.QcCasesSaveVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -15,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  * 病历大模块 前端控制器
@@ -26,26 +26,26 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/qc/cases")
 @RestController
 @SuppressWarnings("unchecked")
-@Api(value = "大模块维护API", tags = { "大模块维护API" })
+@Api(value = "模块数据维护API", tags = { "模块数据维护API" })
 public class QcCasesController {
 
     @Autowired
     private QcCasesFacade qcCasesFacade;
 
-    @ApiOperation(value = "获取医院大模块翻页信息[by:gaodm]",
+    @ApiOperation(value = "获取医院模块数据信息[by:gaodm]",
             notes = "")
     @PostMapping("/getQcCases")
     @SysLogger("getQcCases")
-    public RespDTO<IPage<QcCasesDTO>> getQcCasesFac(@RequestBody QcCasesPageVO qcCasesPageVO) {
-        return RespDTO.onSuc(qcCasesFacade.getQcCasesFac(qcCasesPageVO));
+    public RespDTO<List<QcCasesDTO>> getQcCasesFac() {
+        return RespDTO.onSuc(qcCasesFacade.getQcCasesFac());
     }
 
 
-    @ApiOperation(value = "大模块评分单条保存[by:gaodm]",
+    @ApiOperation(value = "批量更新模块数据[by:gaodm]",
             notes = "")
     @PostMapping("/saveQcCases")
     @SysLogger("saveQcCases")
-    public RespDTO<Boolean> saveQcCases(@RequestBody QcCasesSaveVO qcCasesSaveVO){
-        return RespDTO.onSuc(qcCasesFacade.saveQcCases(qcCasesSaveVO));
+    public RespDTO<Boolean> saveQcCases(@RequestBody List<QcCasesSaveVO> qcCasesSaveVOList) {
+        return RespDTO.onSuc(qcCasesFacade.saveQcCases(qcCasesSaveVOList));
     }
 }

src/main/java/com/diagbot/web/SysUserController.java

@@ -3,6 +3,7 @@ package com.diagbot.web;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.JwtDTO;
 import com.diagbot.dto.LoginDTO;
+import com.diagbot.dto.ModifyPasswordVO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.Token;
 import com.diagbot.facade.TokenFacade;
@@ -13,6 +14,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,12 +22,12 @@ import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 /**
- * @Description: 用户操作API
+ * @Description: 用户账号API
  * @author: gaodm
  * @time: 2018/8/2 13:56
  */
 @RestController
-@Api(value = "用户账号注册等API", tags = { "用户账号注册等API" })
+@Api(value = "用户账号API", tags = { "用户账号API" })
 @RequestMapping("/sys/user")
 @SuppressWarnings("unchecked")
 public class SysUserController {
@@ -74,8 +76,19 @@ public class SysUserController {
         return RespDTO.onSuc(data);
     }
 
+    @ApiOperation(value = "修改密码[by:gaodm]",
+            notes = "password：原密码,必填<br>" +
+                    "modifyPassword：新密码, 必填<br> ")
+    @PostMapping("/midifyPassword")
+    @SysLogger("midifyPassword")
+    @Transactional
+    public RespDTO<Boolean> midifyPassword(@RequestBody ModifyPasswordVO modifyPasswordVO) {
+        Boolean flag = userFacade.modifyPassword(modifyPasswordVO.getPassword(), modifyPasswordVO.getModifyPassword());
+        return RespDTO.onSuc(flag);
+    }
+
 
-    @ApiOperation(value = "获取用户、机构、菜单信息[by:gaodm]",
+    @ApiOperation(value = "获取用户、医院、菜单信息[by:gaodm]",
             notes = "")
     @PostMapping("/getUserOrgMenu")
     @SysLogger("getUserOrgMenu")

src/main/resources/mapper/QcCasesHospitalMapper.xml

@@ -15,4 +15,22 @@
         <result column="modifier" property="modifier" />
     </resultMap>
 
+    <update id="updateBatch">
+        <foreach collection="list" item="item"  separator=";">
+            update qc_cases_hospital
+            <set>
+                <if test="item.score != null">
+                    score = #{item.score},
+                </if>
+                <if test="item.gmtModified != null">
+                    gmt_modified = #{item.gmtModified},
+                </if>
+                <if test="item.modifier != null">
+                    modifier = #{item.modifier},
+                </if>
+            </set>
+            where id = #{item.id} and hospital_id = #{item.hospitalId}
+        </foreach>
+    </update>
+
 </mapper>

src/main/resources/mapper/QcCasesMapper.xml

@@ -31,6 +31,5 @@
         <if test="hospitalId != null and hospitalId != ''">
             and qch.hospital_id = #{hospitalId}
         </if>
-        order by qch.gmt_modified desc
     </select>
 </mapper>