2021/7/22 zhangyan

年度计划编制

src/main/java/com/steerinfo/ems/emsprodplanyear/controller/EmsProdplanYearController.java

@@ -2,25 +2,20 @@ package com.steerinfo.ems.emsprodplanyear.controller;
 
 import com.steerinfo.auth.utils.JwtUtil;
 import com.steerinfo.ems.emsprodplanyear.mapper.EmsProdplanYearMapper;
-import com.steerinfo.ems.trmtransfereactvalue.model.TRmTransfereActValue;
+import com.steerinfo.ems.emsprodplanyear.model.EmsProdplanYear;
+import com.steerinfo.ems.emsprodplanyear.service.IEmsProdplanYearService;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.framework.utils.collection.ListUtils;
-import com.steerinfo.ems.emsprodplanyear.model.EmsProdplanYear;
-import com.steerinfo.ems.emsprodplanyear.service.IEmsProdplanYearService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.math.BigDecimal;
+import java.util.stream.Collectors;
 
 /**
  * EmsProdplanYear RESTful接口：
@@ -51,19 +46,51 @@ public class EmsProdplanYearController extends BaseRESTfulController {
         @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
         @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
     })
-    //@RequiresPermissions("emsprodplanyear:view")
+
     @GetMapping(value = "/")
     public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
         PageList<EmsProdplanYear> list = emsProdplanYearService.queryForPage(parmas, pageNum, pageSize);
         return success(list);
     }
 
+    /**
+     * 根据前端传参，获取页面数据
+     * @RequiresPermissions("emsprodplanyear:view")
+     * @param parmas 参数列表
+     * @param pageNum 开始页码
+     * @param pageSize 一页多少
+     * @return 返回一个带有分页信息的集合
+     */
+    @GetMapping(value = "/getList")
+    public RESTfulResult getlist(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        // 因为有四种产品，所以页面返回参数乘4;
+        pageSize = pageSize * 4;
+        PageList<EmsProdplanYear> list = emsProdplanYearService.queryForPage(parmas, pageNum, pageSize);
+        // 根据月份汇总数据
+        Map<String,List<EmsProdplanYear>> stringListMap =
+                (HashMap<String, List<EmsProdplanYear>>) list.getList().stream().collect(
+                Collectors.groupingBy(EmsProdplanYear::getYearmonth)
+        );
+        // HashMap无序，所以这里要转LinkedHashMap，并返回有序列表
+        Map<String,List<EmsProdplanYear>> sortListMap = new LinkedHashMap<>();
+        stringListMap.entrySet().stream().sorted(
+                Map.Entry.comparingByKey()).forEachOrdered(x-> sortListMap.put(x.getKey(),x.getValue())
+        );
+        List mapList = new ArrayList<>();
+        //数据，进行组装
+        mapList.add(sortListMap);
+        list.setList(mapList);
+        // 返回实际行数
+        list.setTotal(stringListMap.size());
+        return success(list);
+    }
+
     @ApiOperation(value="获取列表", notes="分页模糊查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
         @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
     })
-    //@RequiresPermissions("emsprodplanyear:view")
+
     @GetMapping(value = "/like/")
     public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
         PageList<EmsProdplanYear> list = emsProdplanYearService.queryLikeForPage(parmas, pageNum, pageSize);
@@ -77,16 +104,18 @@ public class EmsProdplanYearController extends BaseRESTfulController {
         String userId = JwtUtil.getUseridByToken();
         for (int i = 0; i < models.length; i++) {
             EmsProdplanYear model = models[i];
-            if(model.getLine() == null || model.getLine().equals("")){
+            Boolean lineBool = (model.getLine() == null || model.getLine().equals(""))
+                    && (model.getProductid() == null || model.getProductid().equals(""));
+            if(lineBool){
                 return  failed(null,"工序为空");
             }
-            if(model.getUnit() == null || model.getUnit().equals("")){
-                return  failed(null,"计量单位为空");
-            }
             if(model.getYearmonth() == null){
                 return  failed(null,"请选择时间");
             }
-            Map map = new HashMap();
+            if (model.getUnit() == null || model.getUnit().equals("")) {
+                model.setUnit("吨");
+            }
+            Map map = new HashMap(16);
             map.put("line",model.getLine());
             map.put("yearmonth",new SimpleDateFormat("yyyy-MM").format(model.getYearmonth()));
             map.put("productid",model.getProductid());
@@ -104,7 +133,7 @@ public class EmsProdplanYearController extends BaseRESTfulController {
 
     @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
-    //@RequiresPermissions("emsprodplanyear:view")
+
     @GetMapping(value = "/{id}")
     public RESTfulResult get(@PathVariable String id){
         EmsProdplanYear emsProdplanYear = emsProdplanYearService.getById(id);
@@ -116,7 +145,7 @@ public class EmsProdplanYearController extends BaseRESTfulController {
         @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
         @ApiImplicitParam(name = "emsProdplanYear", value = "详细实体emsProdplanYear", required = true, dataType = "EmsProdplanYear")
     })
-    //@RequiresPermissions("emsprodplanyear:update")
+
     @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
     public RESTfulResult update(@PathVariable String id, @RequestBody EmsProdplanYear model){
         model.setId(id);
@@ -126,8 +155,8 @@ public class EmsProdplanYearController extends BaseRESTfulController {
 
     @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
-    //@RequiresPermissions("emsprodplanyear:delete")
-    @DeleteMapping(value = "/delete", produces  = "application/json;charset=UTF-8")//String
+
+    @DeleteMapping(value = "/delete", produces  = "application/json;charset=UTF-8")
     public RESTfulResult delete(@RequestBody EmsProdplanYear[] models){
         if(models.length >= 1) {
             for (int i = 0; i < models.length; i++) {
@@ -178,6 +207,30 @@ public class EmsProdplanYearController extends BaseRESTfulController {
 //        return success(list);
 //    }
 
+    @PutMapping(value = "/batchupdateList", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult updateList(@RequestBody EmsProdplanYear[] models) {
+        String userId = JwtUtil.getUseridByToken();
+        for (int i = 0; i < models.length; i++) {
+            EmsProdplanYear model = models[i];
+            if (model.getNo() == null || model.getNo().equals("")) {
+                return failed(null, "id为空");
+            }
+            if (model.getParentid() == null || model.getNo().equals("")) {
+                return failed(null, "parentid为空");
+            }
+            // 因为一行数据由多条数据组成，所以这里为了确保数据准确性，应该再根据编号查询一次新的数据
+            EmsProdplanYear emsProdplanYear = emsProdplanYearService.getById(model.getNo());
+            emsProdplanYear.setWeight(model.getWeight());
+            emsProdplanYear.setWeight1(model.getWeight1());
+            emsProdplanYear.setWeight2(model.getWeight2());
+            emsProdplanYear.setMemo(model.getMemo());
+            emsProdplanYear.setXgr(userId);
+            emsProdplanYear.setXgsj(new Date());
+            emsProdplanYearMapper.updateByPrimaryKey(emsProdplanYear);
+        }
+        return success();
+    }
+
     @PutMapping(value = "/batchupdate", produces  = "application/json;charset=UTF-8")
     public RESTfulResult update(@RequestBody EmsProdplanYear[] models){
         String userId = JwtUtil.getUseridByToken();

src/main/java/com/steerinfo/ems/emsprodplanyear/mapper/EmsProdplanYearMapper.xml

@@ -14,18 +14,20 @@
     <result column="XGSJ" jdbcType="TIMESTAMP" property="xgsj" />
     <result column="MEMO" jdbcType="VARCHAR" property="memo" />
     <result column="CP" jdbcType="VARCHAR" property="cp" />
-    <result column="SYSL" jdbcType="DECIMAL" property="sysl" />
-    <result column="WXSY" jdbcType="DECIMAL" property="wxsy" />
+    <result column="WEIGHT1" jdbcType="DECIMAL" property="weight1" />
+    <result column="WEIGHT2" jdbcType="DECIMAL" property="weight2" />
+    <result column="WEIGHT3" jdbcType="DECIMAL" property="weight3" />
+    <result column="WEIGHT4" jdbcType="DECIMAL" property="weight4" />
     <result column="ZT" jdbcType="VARCHAR" property="zt" />
     <result column="PARENTID" jdbcType="VARCHAR" property="parentid"/>
     <result column="PRODUCTID" jdbcType="VARCHAR" property="productid"/>
   </resultMap>
   <sql id="columns">
-    NO, LINE, YEARMONTH, UNIT, WEIGHT, CJR, CJSJ, XGR, XGSJ, MEMO, CP, SYSL, WXSY,JZSJ,PARENTID,PRODUCTID
+    NO, LINE, YEARMONTH, UNIT, WEIGHT, CJR, CJSJ, XGR, XGSJ, MEMO, CP, WEIGHT1, WEIGHT2,JZSJ,PARENTID,PRODUCTID
   </sql>
   <sql id="columns_alias">
     t.NO, t.LINE, t.YEARMONTH, t.UNIT, t.WEIGHT, t.CJR, t.CJSJ, t.XGR, t.XGSJ, t.MEMO, 
-    t.CP, t.SYSL, t.WXSY,t.JZSJ,t.ZT,t.PARENTID
+    t.CP, t.WEIGHT1, t.WEIGHT2,t.JZSJ,t.ZT,t.PARENTID
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM EMS_PRODPLAN_YEAR
@@ -62,11 +64,11 @@
       <if test="cp != null and cp != ''">
         and CP = #{cp}
       </if>
-      <if test="sysl != null">
-        and SYSL = #{sysl}
+      <if test="weight1 != null">
+        and WEIGHT1 = #{weight1}
       </if>
-      <if test="wxsy != null">
-        and WXSY = #{wxsy}
+      <if test="weight2 != null">
+        and WEIGHT2 = #{weight2}
       </if>
       <if test="zt != null">
         and ZT = #{zt}
@@ -111,11 +113,11 @@
       <if test="cp != null and cp != ''">
         and CP LIKE '%${cp}%'
       </if>
-      <if test="sysl != null">
-        and SYSL = #{sysl}
+      <if test="weight1 != null">
+        and WEIGHT1 = #{weight1}
       </if>
-      <if test="wxsy != null">
-        and WXSY = #{wxsy}
+      <if test="weight2 != null">
+        and WEIGHT2 = #{weight2}
       </if>
     </where>
   </sql>
@@ -156,23 +158,23 @@
       <if test="cp != null and cp != ''">
         or CP = #{cp}
       </if>
-      <if test="sysl != null">
-        or SYSL = #{sysl}
+      <if test="weight1 != null">
+        or WEIGHT1 = #{weight1}
       </if>
-      <if test="wxsy != null">
-        or WXSY = #{wxsy}
+      <if test="weight2 != null">
+        or WEIGHT2 = #{weight2}
       </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.ems.emsprodplanyear.model.EmsProdplanYear">
     insert into EMS_PRODPLAN_YEAR (NO, LINE, YEARMONTH, 
       UNIT, WEIGHT, CJR, 
       CJSJ, XGR, XGSJ, 
-      MEMO, CP, SYSL, WXSY,JZSJ,ZT,PARENTID,PRODUCTID
+      MEMO, CP, WEIGHT1, WEIGHT2,JZSJ,ZT,PARENTID,PRODUCTID
       )
     values (#{no,jdbcType=VARCHAR}, #{line,jdbcType=VARCHAR}, #{yearmonth,jdbcType=VARCHAR}, 
       #{unit,jdbcType=VARCHAR}, #{weight,jdbcType=DECIMAL}, #{cjr,jdbcType=VARCHAR}, 
       #{cjsj,jdbcType=TIMESTAMP}, #{xgr,jdbcType=VARCHAR}, #{xgsj,jdbcType=TIMESTAMP}, 
-      #{memo,jdbcType=VARCHAR}, #{cp,jdbcType=VARCHAR}, #{sysl,jdbcType=DECIMAL}, #{wxsy,jdbcType=DECIMAL},
+      #{memo,jdbcType=VARCHAR}, #{cp,jdbcType=VARCHAR}, #{weight1,jdbcType=DECIMAL}, #{weight2,jdbcType=DECIMAL},
       #{jzsj,jdbcType=TIMESTAMP},#{zt,jdbcType=VARCHAR},#{parentid,jdbcType=VARCHAR},#{productid,jdbcType=VARCHAR}
       )
   </insert>
@@ -212,11 +214,11 @@
       <if test="cp != null">
         CP,
       </if>
-      <if test="sysl != null">
-        SYSL,
+      <if test="weight1 != null">
+        WEIGHT1,
       </if>
-      <if test="wxsy != null">
-        WXSY,
+      <if test="weight2 != null">
+        WEIGHT2,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -253,11 +255,11 @@
       <if test="cp != null">
         #{cp,jdbcType=VARCHAR},
       </if>
-      <if test="sysl != null">
-        #{sysl,jdbcType=DECIMAL},
+      <if test="weight1 != null">
+        #{weight1,jdbcType=DECIMAL},
       </if>
-      <if test="wxsy != null">
-        #{wxsy,jdbcType=DECIMAL},
+      <if test="weight2 != null">
+        #{weight2,jdbcType=DECIMAL},
       </if>
     </trim>
   </insert>
@@ -273,8 +275,8 @@
       XGSJ = #{xgsj,jdbcType=TIMESTAMP},
       MEMO = #{memo,jdbcType=VARCHAR},
       CP = #{cp,jdbcType=VARCHAR},
-      SYSL = #{sysl,jdbcType=DECIMAL},
-      WXSY = #{wxsy,jdbcType=DECIMAL}
+      WEIGHT1 = #{weight1,jdbcType=DECIMAL},
+      WEIGHT2 = #{weight2,jdbcType=DECIMAL}
     where NO = #{no,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.ems.emsprodplanyear.model.EmsProdplanYear">
@@ -310,11 +312,11 @@
       <if test="cp != null">
         CP = #{cp,jdbcType=VARCHAR},
       </if>
-      <if test="sysl != null">
-        SYSL = #{sysl,jdbcType=DECIMAL},
+      <if test="weight1 != null">
+        WEIGHT1 = #{weight1,jdbcType=DECIMAL},
       </if>
-      <if test="wxsy != null">
-        WXSY = #{wxsy,jdbcType=DECIMAL},
+      <if test="weight2 != null">
+        WEIGHT2 = #{weight2,jdbcType=DECIMAL},
       </if>
     </set>
     where NO = #{no,jdbcType=VARCHAR}
@@ -326,6 +328,7 @@
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="where"/>
+    order by YEARMONTH
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
@@ -337,7 +340,7 @@
       LINE, YEARMONTH, UNIT, 
       WEIGHT, CJR, CJSJ, 
       XGR, XGSJ, MEMO, 
-      CP, SYSL, WXSY
+      CP, WEIGHT1, WEIGHT2
       )
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
@@ -345,7 +348,7 @@
       #{item.line,jdbcType=VARCHAR}, #{item.yearmonth,jdbcType=VARCHAR}, #{item.unit,jdbcType=VARCHAR}, 
       #{item.weight,jdbcType=DECIMAL}, #{item.cjr,jdbcType=VARCHAR}, #{item.cjsj,jdbcType=TIMESTAMP}, 
       #{item.xgr,jdbcType=VARCHAR}, #{item.xgsj,jdbcType=TIMESTAMP}, #{item.memo,jdbcType=VARCHAR}, 
-      #{item.cp,jdbcType=VARCHAR}, #{item.sysl,jdbcType=DECIMAL}, #{item.wxsy,jdbcType=DECIMAL}
+      #{item.cp,jdbcType=VARCHAR}, #{item.weight2,jdbcType=DECIMAL}, #{item.weight2,jdbcType=DECIMAL}
        from dual  
    </foreach> )
   </insert>
@@ -396,13 +399,13 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case NO" close="end">
           when #{item.no,jdbcType=VARCHAR} then #{item.cp,jdbcType=VARCHAR}
        </foreach>
-       ,SYSL=
+       ,WEIGHT1=
        <foreach collection="list" item="item" index="index" separator=" " open="case NO" close="end">
-          when #{item.no,jdbcType=VARCHAR} then #{item.sysl,jdbcType=DECIMAL}
+          when #{item.no,jdbcType=VARCHAR} then #{item.weight1,jdbcType=DECIMAL}
        </foreach>
-       ,WXSY=
+       ,WEIGHT2=
        <foreach collection="list" item="item" index="index" separator=" " open="case NO" close="end">
-          when #{item.no,jdbcType=VARCHAR} then #{item.wxsy,jdbcType=DECIMAL}
+          when #{item.no,jdbcType=VARCHAR} then #{item.weight2,jdbcType=DECIMAL}
        </foreach>
      where NO in 
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">

src/main/java/com/steerinfo/ems/emsprodplanyear/model/EmsProdplanYear.java

@@ -1,11 +1,9 @@
 package com.steerinfo.ems.emsprodplanyear.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -51,15 +49,14 @@ public class EmsProdplanYear implements IBasePO<String> {
 
     /**
      * 创建时间(CJSJ,TIMESTAMP,7)
+     *  @JSONField(format = "yyyy-MM-dd ")
      */
     @ApiModelProperty(value="创建时间",required=false)
-    @JSONField(format = "yyyy-MM-dd")
     private Date cjsj;
 
     /**
      * 截止时间
      */
-
     @ApiModelProperty(value="截止时间",required=false)
     @JSONField(format = "yyyy-MM-dd")
     private Date jzsj;
@@ -96,23 +93,46 @@ public class EmsProdplanYear implements IBasePO<String> {
     @ApiModelProperty(value="产品名称",required=false)
     private String cp;
 
+    @ApiModelProperty(value = "父级id",required = false)
+    private String  parentid;
+
+    @ApiModelProperty(value = "产品id",required = false)
+    private String productid;
+
     /**
-     * 使用数量(SYSL,DECIMAL,0)
+     * 状态
      */
-    @ApiModelProperty(value="使用数量",required=false)
-    private Long sysl;
+    @ApiModelProperty(value = "状态",required = false)
+    private String  zt;
+    private String startTime;
+    private String endTime;
 
     /**
-     * 外销数量(WXSY,DECIMAL,0)
+     * 备用重量（焦化：高炉用量；焦粉烧结用量）(WEIGHT1,DECIMAL,0)
      */
-    @ApiModelProperty(value="外销数量",required=false)
-    private Long wxsy;
+    @ApiModelProperty(value="备用重量（焦化：高炉用量；焦粉烧结用量）",required=false)
+    private BigDecimal weight1;
 
-    @ApiModelProperty(value = "父级id",required = false)
-    private String  parentid;
+    /**
+     * 备用重量（焦化：外销数量；）(WEIGHT2,DECIMAL,0)
+     */
+    @ApiModelProperty(value="备用重量（焦化：外销数量；）",required=false)
+    private BigDecimal weight2;
+
+    /**
+     * 高炉用量(WEIGHT3,DECIMAL,0)
+     */
+    @ApiModelProperty(value="高炉用量",required=false)
+    private BigDecimal weight3;
+
+    /**
+     * 高炉用量(WEIGHT4,DECIMAL,0)
+     */
+    @ApiModelProperty(value="外销数量",required=false)
+    private BigDecimal weight4;
+
+    private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "产品id",required = false)
-    private String productid;
     public String getProductid() {
         return productid;
     }
@@ -121,14 +141,6 @@ public class EmsProdplanYear implements IBasePO<String> {
         this.productid = productid;
     }
 
-    /**
-     * 状态
-     */
-    @ApiModelProperty(value = "状态",required = false)
-    private String  zt;
-    private String startTime;
-    private String endTime;
-
     public String getStartTime() {
         return startTime;
     }
@@ -153,8 +165,6 @@ public class EmsProdplanYear implements IBasePO<String> {
         this.zt = zt;
     }
 
-    private static final long serialVersionUID = 1L;
-
     @Override
     public String getId() {
         return this.no;
@@ -225,9 +235,7 @@ public class EmsProdplanYear implements IBasePO<String> {
         return xgr;
     }
 
-    public void setXgr(String xgr) {
-        this.xgr = xgr == null ? null : xgr.trim();
-    }
+    public void setXgr(String xgr) { this.xgr = xgr == null ? null : xgr.trim(); }
 
     public Date getXgsj() {
         return xgsj;
@@ -253,22 +261,6 @@ public class EmsProdplanYear implements IBasePO<String> {
         this.cp = cp == null ? null : cp.trim();
     }
 
-    public Long getSysl() {
-        return sysl;
-    }
-
-    public void setSysl(Long sysl) {
-        this.sysl = sysl;
-    }
-
-    public Long getWxsy() {
-        return wxsy;
-    }
-
-    public void setWxsy(Long wxsy) {
-        this.wxsy = wxsy;
-    }
-
     public String getParentid() {
         return parentid;
     }
@@ -277,6 +269,23 @@ public class EmsProdplanYear implements IBasePO<String> {
         this.parentid = parentid;
     }
 
+    public BigDecimal getWeight1() { return weight1; }
+
+    public void setWeight1(BigDecimal weight1) { this.weight1 = weight1; }
+
+    public BigDecimal getWeight2() { return weight2; }
+
+    public void setWeight2(BigDecimal weight2) { this.weight2 = weight2; }
+
+    public BigDecimal getWeight3() { return weight3; }
+
+    public void setWeight3(BigDecimal weight3) { this.weight3 = weight3; }
+
+    public BigDecimal getWeight4() { return weight4; }
+
+    public void setWeight4(BigDecimal weight4) { this.weight4 = weight4; }
+
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -295,12 +304,14 @@ public class EmsProdplanYear implements IBasePO<String> {
         sb.append(", xgsj=").append(xgsj);
         sb.append(", memo=").append(memo);
         sb.append(", cp=").append(cp);
-        sb.append(", sysl=").append(sysl);
-        sb.append(", wxsy=").append(wxsy);
         sb.append(",parentid=").append(parentid);
         sb.append(",zt=").append(zt);
-        sb.append("startTime=").append(startTime);
-        sb.append("endTime=").append(endTime);
+        sb.append(",startTime=").append(startTime);
+        sb.append(",endTime=").append(endTime);
+        sb.append(",weight1=").append(weight1);
+        sb.append(",weight2=").append(weight2);
+        sb.append(",weight3=").append(weight3);
+        sb.append(",weight4=").append(weight4);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();