优化 条件排序问题

java110-bean/src/main/java/com/java110/dto/reportCustomComponentCondition/ReportCustomComponentConditionDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.reportCustomComponentCondition;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,12 +16,13 @@ import java.util.Date;
 public class ReportCustomComponentConditionDto extends PageDto implements Serializable {
 
     private String componentId;
-private String conditionId;
-private String param;
-private String name;
-private String remark;
-private String holdpace;
-private String type;
+    private String conditionId;
+    private String param;
+    private String name;
+    private String remark;
+    private String holdpace;
+    private String type;
+    private String seq;
 
 
     private Date createTime;
@@ -31,43 +33,56 @@ private String type;
     public String getComponentId() {
         return componentId;
     }
-public void setComponentId(String componentId) {
+
+    public void setComponentId(String componentId) {
         this.componentId = componentId;
     }
-public String getConditionId() {
+
+    public String getConditionId() {
         return conditionId;
     }
-public void setConditionId(String conditionId) {
+
+    public void setConditionId(String conditionId) {
         this.conditionId = conditionId;
     }
-public String getParam() {
+
+    public String getParam() {
         return param;
     }
-public void setParam(String param) {
+
+    public void setParam(String param) {
         this.param = param;
     }
-public String getName() {
+
+    public String getName() {
         return name;
     }
-public void setName(String name) {
+
+    public void setName(String name) {
         this.name = name;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getHoldpace() {
+
+    public String getHoldpace() {
         return holdpace;
     }
-public void setHoldpace(String holdpace) {
+
+    public void setHoldpace(String holdpace) {
         this.holdpace = holdpace;
     }
-public String getType() {
+
+    public String getType() {
         return type;
     }
-public void setType(String type) {
+
+    public void setType(String type) {
         this.type = type;
     }
 
@@ -87,4 +102,12 @@ public void setType(String type) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getSeq() {
+        return seq;
+    }
+
+    public void setSeq(String seq) {
+        this.seq = seq;
+    }
 }

java110-bean/src/main/java/com/java110/po/reportCustomComponentCondition/ReportCustomComponentConditionPo.java

@@ -16,7 +16,7 @@
 package com.java110.po.reportCustomComponentCondition;
 
 import java.io.Serializable;
-import java.util.Date;
+
 /**
  * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2021-11-09 13:33:12 mail: 928255095@qq.com
@@ -28,62 +28,84 @@ import java.util.Date;
 public class ReportCustomComponentConditionPo implements Serializable {
 
     private String componentId;
-private String conditionId;
-private String param;
-private String name;
-private String remark;
-private String statusCd = "0";
-private String holdpace;
-private String type;
-public String getComponentId() {
+    private String conditionId;
+    private String param;
+    private String name;
+    private String remark;
+    private String statusCd = "0";
+    private String holdpace;
+    private String type;
+    private String seq;
+
+    public String getComponentId() {
         return componentId;
     }
-public void setComponentId(String componentId) {
+
+    public void setComponentId(String componentId) {
         this.componentId = componentId;
     }
-public String getConditionId() {
+
+    public String getConditionId() {
         return conditionId;
     }
-public void setConditionId(String conditionId) {
+
+    public void setConditionId(String conditionId) {
         this.conditionId = conditionId;
     }
-public String getParam() {
+
+    public String getParam() {
         return param;
     }
-public void setParam(String param) {
+
+    public void setParam(String param) {
         this.param = param;
     }
-public String getName() {
+
+    public String getName() {
         return name;
     }
-public void setName(String name) {
+
+    public void setName(String name) {
         this.name = name;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getHoldpace() {
+
+    public String getHoldpace() {
         return holdpace;
     }
-public void setHoldpace(String holdpace) {
+
+    public void setHoldpace(String holdpace) {
         this.holdpace = holdpace;
     }
-public String getType() {
+
+    public String getType() {
         return type;
     }
-public void setType(String type) {
+
+    public void setType(String type) {
         this.type = type;
     }
 
+    public String getSeq() {
+        return seq;
+    }
 
-
+    public void setSeq(String seq) {
+        this.seq = seq;
+    }
 }

java110-db/src/main/resources/mapper/report/ReportCustomComponentConditionV1ServiceDaoImplMapper.xml

@@ -5,120 +5,119 @@
 <mapper namespace="reportCustomComponentConditionV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存报表组件条件信息 add by wuxw 2018-07-03 -->
     <insert id="saveReportCustomComponentConditionInfo" parameterType="Map">
         insert into report_custom_component_condition(
-component_id,condition_id,param,name,remark,holdpace,type
-) values (
-#{componentId},#{conditionId},#{param},#{name},#{remark},#{holdpace},#{type}
-)
+        component_id,condition_id,param,name,remark,holdpace,type,seq
+        ) values (
+        #{componentId},#{conditionId},#{param},#{name},#{remark},#{holdpace},#{type},#{seq}
+        )
     </insert>
 
 
-
     <!-- 查询报表组件条件信息 add by wuxw 2018-07-03 -->
     <select id="getReportCustomComponentConditionInfo" parameterType="Map" resultType="Map">
-        select  t.component_id,t.component_id componentId,t.condition_id,t.condition_id conditionId,t.param,t.name,t.remark,t.status_cd,t.status_cd statusCd,t.holdpace,t.type 
-from report_custom_component_condition t 
-where 1 =1 
-<if test="componentId !=null and componentId != ''">
-   and t.component_id= #{componentId}
-</if> 
-<if test="conditionId !=null and conditionId != ''">
-   and t.condition_id= #{conditionId}
-</if> 
-<if test="param !=null and param != ''">
-   and t.param= #{param}
-</if> 
-<if test="name !=null and name != ''">
-   and t.name= #{name}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="holdpace !=null and holdpace != ''">
-   and t.holdpace= #{holdpace}
-</if> 
-<if test="type !=null and type != ''">
-   and t.type= #{type}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.component_id,t.component_id componentId,t.condition_id,t.condition_id
+        conditionId,t.param,t.name,t.remark,t.status_cd,t.status_cd statusCd,t.holdpace,t.type,t.seq
+        from report_custom_component_condition t
+        where 1 =1
+        <if test="componentId !=null and componentId != ''">
+            and t.component_id= #{componentId}
+        </if>
+        <if test="conditionId !=null and conditionId != ''">
+            and t.condition_id= #{conditionId}
+        </if>
+        <if test="param !=null and param != ''">
+            and t.param= #{param}
+        </if>
+        <if test="name !=null and name != ''">
+            and t.name= #{name}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="holdpace !=null and holdpace != ''">
+            and t.holdpace= #{holdpace}
+        </if>
+        <if test="type !=null and type != ''">
+            and t.type= #{type}
+        </if>
+        order by t.seq
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改报表组件条件信息 add by wuxw 2018-07-03 -->
     <update id="updateReportCustomComponentConditionInfo" parameterType="Map">
-        update  report_custom_component_condition t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="componentId !=null and componentId != ''">
-, t.component_id= #{componentId}
-</if> 
-<if test="param !=null and param != ''">
-, t.param= #{param}
-</if> 
-<if test="name !=null and name != ''">
-, t.name= #{name}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="holdpace !=null and holdpace != ''">
-, t.holdpace= #{holdpace}
-</if> 
-<if test="type !=null and type != ''">
-, t.type= #{type}
-</if> 
- where 1=1 <if test="conditionId !=null and conditionId != ''">
-and t.condition_id= #{conditionId}
-</if> 
+        update report_custom_component_condition t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="componentId !=null and componentId != ''">
+            , t.component_id= #{componentId}
+        </if>
+        <if test="param !=null and param != ''">
+            , t.param= #{param}
+        </if>
+        <if test="name !=null and name != ''">
+            , t.name= #{name}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="holdpace !=null and holdpace != ''">
+            , t.holdpace= #{holdpace}
+        </if>
+        <if test="type !=null and type != ''">
+            , t.type= #{type}
+        </if>
+        <if test="seq !=null and seq != ''">
+            , t.seq= #{seq}
+        </if>
+        where 1=1
+        <if test="conditionId !=null and conditionId != ''">
+            and t.condition_id= #{conditionId}
+        </if>
 
     </update>
 
     <!-- 查询报表组件条件数量 add by wuxw 2018-07-03 -->
-     <select id="queryReportCustomComponentConditionsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from report_custom_component_condition t 
-where 1 =1 
-<if test="componentId !=null and componentId != ''">
-   and t.component_id= #{componentId}
-</if> 
-<if test="conditionId !=null and conditionId != ''">
-   and t.condition_id= #{conditionId}
-</if> 
-<if test="param !=null and param != ''">
-   and t.param= #{param}
-</if> 
-<if test="name !=null and name != ''">
-   and t.name= #{name}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="holdpace !=null and holdpace != ''">
-   and t.holdpace= #{holdpace}
-</if> 
-<if test="type !=null and type != ''">
-   and t.type= #{type}
-</if> 
+    <select id="queryReportCustomComponentConditionsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from report_custom_component_condition t
+        where 1 =1
+        <if test="componentId !=null and componentId != ''">
+            and t.component_id= #{componentId}
+        </if>
+        <if test="conditionId !=null and conditionId != ''">
+            and t.condition_id= #{conditionId}
+        </if>
+        <if test="param !=null and param != ''">
+            and t.param= #{param}
+        </if>
+        <if test="name !=null and name != ''">
+            and t.name= #{name}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="holdpace !=null and holdpace != ''">
+            and t.holdpace= #{holdpace}
+        </if>
+        <if test="type !=null and type != ''">
+            and t.type= #{type}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

service-report/src/main/java/com/java110/report/cmd/reportCustomComponentCondition/DeleteReportCustomComponentConditionCmd.java

@@ -21,16 +21,16 @@ import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.AbstractServiceCmdListener;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.report.IReportCustomComponentConditionV1InnerServiceSMO;
 import com.java110.po.reportCustomComponentCondition.ReportCustomComponentConditionPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
 /**
  * 类表述：删除
  * 服务编码：reportCustomComponentCondition.deleteReportCustomComponentCondition
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
  */
 @Java110Cmd(serviceCode = "reportCustomComponentCondition.deleteReportCustomComponentCondition")
 public class DeleteReportCustomComponentConditionCmd extends AbstractServiceCmdListener {
-  private static Logger logger = LoggerFactory.getLogger(DeleteReportCustomComponentConditionCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(DeleteReportCustomComponentConditionCmd.class);
 
     @Autowired
     private IReportCustomComponentConditionV1InnerServiceSMO reportCustomComponentConditionV1InnerServiceSMOImpl;
@@ -51,7 +51,7 @@ public class DeleteReportCustomComponentConditionCmd extends AbstractServiceCmdL
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "conditionId", "conditionId不能为空");
-Assert.hasKeyAndValue(reqJson, "conditionId", "conditionId不能为空");
+        Assert.hasKeyAndValue(reqJson, "conditionId", "conditionId不能为空");
 
     }
 
@@ -59,7 +59,7 @@ Assert.hasKeyAndValue(reqJson, "conditionId", "conditionId不能为空");
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       ReportCustomComponentConditionPo reportCustomComponentConditionPo = BeanConvertUtil.covertBean(reqJson, ReportCustomComponentConditionPo.class);
+        ReportCustomComponentConditionPo reportCustomComponentConditionPo = BeanConvertUtil.covertBean(reqJson, ReportCustomComponentConditionPo.class);
         int flag = reportCustomComponentConditionV1InnerServiceSMOImpl.deleteReportCustomComponentCondition(reportCustomComponentConditionPo);
 
         if (flag < 1) {