计时修改

src/main/java/com/steerinfo/dil/model/AmstruckInwardRequirement.java

@@ -166,6 +166,12 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="矿石备注",required=false)
     private String isMineral;
 
+    /**
+     * 装机备注(LOADING_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="装机备注",required=false)
+    private String loadingRemark;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -386,6 +392,14 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
         this.isMineral = isMineral == null ? null : isMineral.trim();
     }
 
+    public String getLoadingRemark() {
+        return loadingRemark;
+    }
+
+    public void setLoadingRemark(String loadingRemark) {
+        this.loadingRemark = loadingRemark;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -418,6 +432,7 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
         sb.append(", requirementLinkType=").append(requirementLinkType);
         sb.append(", dueDate=").append(dueDate);
         sb.append(", isMineral=").append(isMineral);
+        sb.append(", loadingRemark=").append(loadingRemark);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/impl/AmstruckInwardRequirementServiceImpl.java

@@ -69,6 +69,8 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         BigDecimal capacityTypeId=DataChange.dataToBigDecimal(mapValue.get("capacityTypeId"));
         String InsertUpdateRemark = (String) mapValue.get("remark");
         String isMineral    = (String)mapValue.get("isMineral");
+//        取出装机需求
+        String loadingRemark = (String) mapValue.get("installremark");
         Long dueTime =(Long) mapValue.get("DueTime");
 
         AmstruckInwardRequirement amstruckInwardRequirement = new AmstruckInwardRequirement();
@@ -114,6 +116,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         amstruckInwardRequirement.setInsertUsername((String) mapValue.get("orgCode"));
         amstruckInwardRequirement.setInsertUpdateRemark(InsertUpdateRemark);
         amstruckInwardRequirement.setDeleted(new BigDecimal(0));
+        amstruckInwardRequirement.setLoadingRemark(loadingRemark);
         int result = 0;
         result += amstruckInwardRequirementMapper.insertSelective(amstruckInwardRequirement);
         // 物资中间表

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/ams
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

src/main/resources/com/steerinfo/dil/mapper/AmstruckInwardRequirementMapper.xml

@@ -28,6 +28,7 @@
         <result column="REQUIREMENT_LINK_TYPE" jdbcType="DECIMAL" property="requirementLinkType" />
         <result column="DUE_DATE" jdbcType="TIMESTAMP" property="dueDate" />
         <result column="IS_MINERAL" jdbcType="VARCHAR" property="isMineral" />
+        <result column="LOADING_REMARK" jdbcType="VARCHAR" property="loadingRemark" />
     </resultMap>
     <sql id="columns">
         REQUIREMENT_ID, PURCHASE_ORDER_ID, REQUIREMENT_NUMBER, REQUIREMENT_TYPE, CAPACITY_TYPE_ID, 
@@ -35,7 +36,7 @@
     LINE_ID, REQUIREMENT_WORK_ENVIRONMENT, REQUIREMENT_ESTIMATED_DURATION, REQUIREMENT_OVERLIMIT, 
     REQUIREMNT_UNIT_ID, REQUIREMENT_STATUS, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
     UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, REQUIREMENT_UNLOAD_UNIT_ID, REQUIREMENT_PLATFORM_ID, 
-    REQUIREMENT_LINK_TYPE, DUE_DATE, IS_MINERAL
+    REQUIREMENT_LINK_TYPE, DUE_DATE, IS_MINERAL, LOADING_REMARK
     </sql>
     <sql id="columns_alias">
         t.REQUIREMENT_ID, t.PURCHASE_ORDER_ID, t.REQUIREMENT_NUMBER, t.REQUIREMENT_TYPE, 
@@ -44,7 +45,7 @@
     t.REQUIREMENT_OVERLIMIT, t.REQUIREMNT_UNIT_ID, t.REQUIREMENT_STATUS, t.INSERT_USERNAME, 
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, 
     t.REQUIREMENT_UNLOAD_UNIT_ID, t.REQUIREMENT_PLATFORM_ID, t.REQUIREMENT_LINK_TYPE, 
-    t.DUE_DATE, t.IS_MINERAL
+    t.DUE_DATE, t.IS_MINERAL, t.LOADING_REMARK
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM AMSTRUCK_INWARD_REQUIREMENT
@@ -132,6 +133,9 @@
             <if test="isMineral != null and isMineral != ''">
                 and IS_MINERAL = #{isMineral}
             </if>
+            <if test="loadingRemark != null and loadingRemark != ''">
+                and LOADING_REMARK = #{loadingRemark}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -214,6 +218,9 @@
             <if test="isMineral != null and isMineral != ''">
                 and IS_MINERAL LIKE '%${isMineral}%'
             </if>
+            <if test="loadingRemark != null and loadingRemark != ''">
+                and LOADING_REMARK LIKE '%${loadingRemark}%'
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="decimal">
@@ -298,6 +305,9 @@
         <if test="isMineral != null and isMineral != ''">
             or IS_MINERAL = #{isMineral}
         </if>
+        <if test="loadingRemark != null and loadingRemark != ''">
+            or LOADING_REMARK = #{loadingRemark}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
         insert into AMSTRUCK_INWARD_REQUIREMENT (REQUIREMENT_ID, PURCHASE_ORDER_ID, REQUIREMENT_NUMBER,
@@ -319,7 +329,7 @@
                 #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
                 #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{requirementUnloadUnitId,jdbcType=DECIMAL},
                 #{requirementPlatformId,jdbcType=DECIMAL}, #{requirementLinkType,jdbcType=DECIMAL},
-                #{dueDate,jdbcType=TIMESTAMP}, #{isMineral,jdbcType=VARCHAR})
+                #{dueDate,jdbcType=TIMESTAMP}, #{isMineral,jdbcType=VARCHAR}, #{loadingRemark,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
         insert into AMSTRUCK_INWARD_REQUIREMENT
@@ -402,6 +412,9 @@
             <if test="isMineral != null">
                 IS_MINERAL,
             </if>
+            <if test="loadingRemark != null">
+                LOADING_REMARK,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="requirementId != null">
@@ -482,6 +495,9 @@
             <if test="isMineral != null">
                 #{isMineral,jdbcType=VARCHAR},
             </if>
+            <if test="loadingRemark != null">
+                #{loadingRemark,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
@@ -510,7 +526,8 @@
             REQUIREMENT_PLATFORM_ID = #{requirementPlatformId,jdbcType=DECIMAL},
             REQUIREMENT_LINK_TYPE = #{requirementLinkType,jdbcType=DECIMAL},
             DUE_DATE = #{dueDate,jdbcType=TIMESTAMP},
-            IS_MINERAL = #{isMineral,jdbcType=VARCHAR}
+            IS_MINERAL = #{isMineral,jdbcType=VARCHAR},
+            LOADING_REMARK = #{loadingRemark,jdbcType=VARCHAR}
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
@@ -591,6 +608,9 @@
             <if test="isMineral != null">
                 IS_MINERAL = #{isMineral,jdbcType=VARCHAR},
             </if>
+            <if test="loadingRemark != null">
+                LOADING_REMARK = #{loadingRemark,jdbcType=VARCHAR},
+            </if>
         </set>
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </update>
@@ -637,7 +657,7 @@
         #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
         #{item.requirementUnloadUnitId,jdbcType=DECIMAL}, #{item.requirementPlatformId,jdbcType=DECIMAL},
         #{item.requirementLinkType,jdbcType=DECIMAL}, #{item.dueDate,jdbcType=TIMESTAMP},
-        #{item.isMineral,jdbcType=VARCHAR} from dual
+        #{item.isMineral,jdbcType=VARCHAR},#{item.loadingRemark,jdbcType=VARCHAR}  from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -747,6 +767,10 @@
         <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_ID" separator=" ">
             when #{item.requirementId,jdbcType=DECIMAL} then #{item.isMineral,jdbcType=VARCHAR}
         </foreach>
+        ,LOADING_REMARK=
+        <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_ID" separator=" ">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.loadingRemark,jdbcType=VARCHAR}
+        </foreach>
         where REQUIREMENT_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.requirementId,jdbcType=DECIMAL}
@@ -777,6 +801,7 @@
         AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
         AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
         AIR.REQUIREMENT_OVERLIMIT AS "requirementOverlimit",
+        AIR.LOADING_REMARK AS "loadingRemark",
         RS.SHIPPER_NAME AS "shipperName",
         AIR.INSERT_TIME AS "insertTime",
         AIR.DUE_DATE AS "dueDate",
@@ -905,6 +930,7 @@
         AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
         AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
         AIR.REQUIREMENT_OVERLIMIT AS "requirementOverlimit",
+        AIR.LOADING_REMARK AS "loadingRemark",
         RS.SHIPPER_NAME AS "shipperName",
         AIR.INSERT_TIME AS "insertTime",
         AIR.INSERT_USERNAME AS "insertUsername",