Merge remote-tracking branch 'origin/dev/icss' into debug

icss-service/src/main/java/com/diagbot/entity/QuestionUsual.java

@@ -61,12 +61,6 @@ public class QuestionUsual implements Serializable {
      */
     private Long deptId;
 
-    /**
-     * 1：常见，0：不常见
-     */
-    private String usual;
-
-    private String type;
 
     /**
      * 排序号
@@ -142,20 +136,7 @@ public class QuestionUsual implements Serializable {
     public void setDeptId(Long deptId) {
         this.deptId = deptId;
     }
-    public String getUsual() {
-        return usual;
-    }
 
-    public void setUsual(String usual) {
-        this.usual = usual;
-    }
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
     public String getRemark() {
         return remark;
     }
@@ -175,8 +156,6 @@ public class QuestionUsual implements Serializable {
         ", modifier=" + modifier +
         ", questionId=" + questionId +
         ", deptId=" + deptId +
-        ", usual=" + usual +
-        ", type=" + type +
         ", remark=" + remark +
         "}";
     }

icss-service/src/main/resources/mapper/QuestionUsualMapper.xml

@@ -12,8 +12,6 @@
         <result column="modifier" property="modifier" />
         <result column="question_id" property="questionId" />
         <result column="dept_id" property="deptId" />
-        <result column="usual" property="usual" />
-        <result column="type" property="type" />
         <result column="order_no" property="orderNo" />
         <result column="remark" property="remark" />
     </resultMap>

icssman-service/src/main/java/com/diagbot/entity/QuestionUsual.java

@@ -61,13 +61,6 @@ public class QuestionUsual implements Serializable {
      */
     private Long deptId;
 
-    /**
-     * 1：常见，0：不常见
-     */
-    private String usual;
-
-    private String type;
-
     /**
      * 排序号
      */
@@ -134,20 +127,7 @@ public class QuestionUsual implements Serializable {
     public void setDeptId(Long deptId) {
         this.deptId = deptId;
     }
-    public String getUsual() {
-        return usual;
-    }
 
-    public void setUsual(String usual) {
-        this.usual = usual;
-    }
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
     public Long getOrderNo() {
         return orderNo;
     }
@@ -174,8 +154,6 @@ public class QuestionUsual implements Serializable {
         ", modifier=" + modifier +
         ", questionId=" + questionId +
         ", deptId=" + deptId +
-        ", usual=" + usual +
-        ", type=" + type +
         ", orderNo=" + orderNo +
         ", remark=" + remark +
         "}";

icssman-service/src/main/java/com/diagbot/facade/QuestionUsualFacade.java

@@ -9,7 +9,6 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.entity.QuestionUsual;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.UsualEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.QuestionUsualService;
@@ -81,7 +80,6 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
             questionUsual.setQuestionId(questionUsualVO.getQuestionId().get(i));
             questionUsual.setDeptId(questionUsualVO.getDeptId());
             questionUsual.setOrderNo(Long.parseLong(String.valueOf(i + 1)));
-            questionUsual.setUsual(String.valueOf(UsualEnum.Enable.getKey()));
             addList.add(questionUsual);
         }
         Boolean flag = questionUsualService.saveBatch(addList);

icssman-service/src/main/resources/mapper/QuestionUsualMapper.xml

@@ -12,8 +12,6 @@
         <result column="modifier" property="modifier" />
         <result column="question_id" property="questionId" />
         <result column="dept_id" property="deptId" />
-        <result column="usual" property="usual" />
-        <result column="type" property="type" />
         <result column="order_no" property="orderNo" />
         <result column="remark" property="remark" />
     </resultMap>