修改

src/main/java/com/steerinfo/dil/controller/TmsshipLoadShipResultController.java

@@ -86,6 +86,21 @@ public class TmsshipLoadShipResultController extends BaseRESTfulController {
         return success(code);
     }
 
+    /**
+     * 修改装船作业信息
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="修改装船作业信息", notes="根据TmsshipLoadShipResult对象修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmsshipLoadShipResult",value = "装船作业字段",required = true,paramType = "TmsshipLoadShipResult")
+    })
+    @PostMapping("/updateThreeSectionDetails")
+    public RESTfulResult updateThreeSectionDetails(@RequestBody Map<String,Object> map) {
+        int code = tmsshipLoadShipResultService.updateThreeSectionDetails(map);
+        return success(code);
+    }
+
     /**
      * 删除装船作业信息
      * @param resultId
@@ -131,6 +146,7 @@ public class TmsshipLoadShipResultController extends BaseRESTfulController {
         return success(tmsshipLoadShipResult);
     }
 
+
     /**
      * 展示装船作业信息列表
      * @param mapVal

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

@@ -108,7 +108,6 @@ public class TmsshipWaterQualityResult implements IBasePO<BigDecimal> {
     /**
      * 预计放货日期(RESULT_ES_DELIVERY_DATE,TIMESTAMP,7)
      */
- 
     @ApiModelProperty(value="预计放货日期",required=false)
     private Date resultEsDeliveryDate;
 
@@ -119,9 +118,9 @@ public class TmsshipWaterQualityResult implements IBasePO<BigDecimal> {
     private BigDecimal deleted;
 
     /**
-     * 单价(WATER_UNIT_PRICE,DECIMAL,0)
+     * 水运单价(WATER_UNIT_PRICE,DECIMAL,0)
      */
-    @ApiModelProperty(value="单价",required=false)
+    @ApiModelProperty(value="水运单价",required=false)
     private BigDecimal waterUnitPrice;
 
     /**
@@ -130,6 +129,12 @@ public class TmsshipWaterQualityResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="是否需要拼装",required=false)
     private String isNeedAssemble;
 
+    /**
+     * 水运单价ID(UNIT_PRICE_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="水运单价ID",required=false)
+    private BigDecimal unitPriceId;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -302,6 +307,14 @@ public class TmsshipWaterQualityResult implements IBasePO<BigDecimal> {
         this.isNeedAssemble = isNeedAssemble == null ? null : isNeedAssemble.trim();
     }
 
+    public BigDecimal getUnitPriceId() {
+        return unitPriceId;
+    }
+
+    public void setUnitPriceId(BigDecimal unitPriceId) {
+        this.unitPriceId = unitPriceId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -328,6 +341,7 @@ public class TmsshipWaterQualityResult implements IBasePO<BigDecimal> {
         sb.append(", deleted=").append(deleted);
         sb.append(", waterUnitPrice=").append(waterUnitPrice);
         sb.append(", isNeedAssemble=").append(isNeedAssemble);
+        sb.append(", unitPriceId=").append(unitPriceId);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/ITmsshipLoadShipResultService.java

@@ -51,6 +51,7 @@ public interface ITmsshipLoadShipResultService {
      */
     int updateLoadShip(Map<String,Object> map);
 
+    int updateThreeSectionDetails(Map<String,Object> map);
 
     /**
      * 查询所有作业位置

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

@@ -198,6 +198,7 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         //单价
         BigDecimal waterUnitPrice =DataChange.dataToBigDecimal(mapVal.get("waterUnitPrice"));
         tmsshipWaterQualityResult.setWaterUnitPrice(waterUnitPrice);
+        tmsshipWaterQualityResult.setUnitPriceId(DataChange.dataToBigDecimal(mapVal.get("unitPriceId")));
         //空载
         String resultEmptyHeavyWaterMeter = (String) mapVal.get("resultEmptyHeavyWaterMeter");
         tmsshipWaterQualityResult.setResultEmptyHeavyWaterMeter(resultEmptyHeavyWaterMeter);
@@ -279,6 +280,49 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         return i;
     }
 
+    @Override
+    public int updateThreeSectionDetails(Map<String, Object> map) {
+        int i=0;
+        //装船实绩
+        TmsshipLoadShipResult tmsshipLoadShipResult=new TmsshipLoadShipResult();
+        tmsshipLoadShipResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
+        tmsshipLoadShipResult.setResultLoadShipDate(new Date((long) map.get("resultLoadShipDate")));
+        tmsshipLoadShipResult.setResultActualInstallations(DataChange.dataToBigDecimal(map.get("resultActualInstallations")));
+        tmsshipLoadShipResult.setResultOutPortTime(new Date((long) map.get("resultOutPortTime")));
+        tmsshipLoadShipResult.setResultArrivalPortTime(new Date((long) map.get("resultArrivalPortTime")));
+        tmsshipLoadShipResult.setUpdateTime(new Date());
+        tmsshipLoadShipResult.setUpdateUsername((String) map.get("userId"));
+        tmsshipLoadShipResult.setResultIsclear((String) map.get("resultIsClear"));
+        //水分质检实绩
+        TmsshipWaterQualityResult tmsshipWaterQualityResult=new TmsshipWaterQualityResult();
+        tmsshipWaterQualityResult.setResultId(DataChange.dataToBigDecimal(map.get("waterQualiyResultId")));
+        if(map.get("planDate")!=null && !map.get("planDate").toString().equals("0")){
+            long planDate =(long) map.get("planDate");
+            tmsshipWaterQualityResult.setResultPlannedDate(new Date(planDate));
+        }
+        if(map.get("planDeliveryDate")!=null && !map.get("planDeliveryDate").toString().equals("0")){
+            long planDeliveryDate =(long) map.get("planDeliveryDate");
+            tmsshipWaterQualityResult.setResultEsDeliveryDate(new Date(planDeliveryDate));
+        }
+        String resultHeavyWeight =(String) map.get("resultHeavyWeight");
+        tmsshipWaterQualityResult.setResultEmptyHeavyWaterMeter(resultHeavyWeight);
+        tmsshipWaterQualityResult.setUnitPriceId(DataChange.dataToBigDecimal(map.get("unitPriceId")));
+        tmsshipWaterQualityResult.setWaterUnitPrice(DataChange.dataToBigDecimal(map.get("waterUnitPrice")));
+        tmsshipWaterQualityResult.setIsNeedAssemble((String) map.get("isNeedAssemble"));
+        tmsshipWaterQualityResult.setResultInspectionFees(DataChange.dataToBigDecimal(map.get("resultInspectionFees")));
+        tmsshipWaterQualityResult.setResultMoistureContent(DataChange.dataToBigDecimal(map.get("resultMoistureContent")));
+        tmsshipWaterQualityResult.setResultWaterTonnage(DataChange.dataToBigDecimal(map.get("moistureTonnage")));
+        //离开港口实绩
+        TmsshipOutWharyResult tmsshipOutWharyResult=new TmsshipOutWharyResult();
+        tmsshipOutWharyResult.setResultId(DataChange.dataToBigDecimal(map.get("outWharyResultId")));
+        tmsshipOutWharyResult.setResultOutWharyName((String) map.get("resultOutPortName"));
+        tmsshipOutWharyResult.setResultOutWharyTime(new Date((long)map.get("resultOutPortTime")));
+        i += tmsshipOutWharyResultMapper.updateByPrimaryKeySelective(tmsshipOutWharyResult);
+        i += tmsshipLoadShipResultMapper.updateByPrimaryKeySelective(tmsshipLoadShipResult);
+        i +=tmsshipWaterQualityResultMapper.updateByPrimaryKeySelective(tmsshipWaterQualityResult);
+        return i;
+    }
+
     /**
      * 查询所有装船信息
      * @param mapVal

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

@@ -785,25 +785,45 @@
 
     <select id="selectLoadShip" parameterType="DECIMAL" resultType="java.util.Map">
         SELECT
-               TLSR.BATCH_ID                    "batchId",
-               TLSR.RESULT_DELIVERY_DATE        "resultDeliveryDate",
-               TLSR.RESULT_ACTUAL_INSTALLATIONS "resultActualInstallations",
-               TLSR.RWAREHOUSE_MATERIAL_ID      "rwarehouseMaterialId",
-               TLSR.RESULT_ARRIVAL_PORT_TIME    "resultArrivalPortTime",
-               TLSR.RESULT_OUT_PORT_TIME        "resultOutPortTime",
-               TLSR.RESULT_LOAD_SHIP_DATE       "resultLoadShipDate",
-               TLSR.RESULT_ISCLEAR              "resultIsClear",
-               TWQR.RESULT_ES_DELIVERY_DATE    "planDeliveryDate",
-               TWQR.RESULT_PLANNED_DATE "planDate",
-               TWQR.RESULT_EMPTY_HEAVY_WATER_METER "resultHeavyWeight",
-               TWQR.RESULT_ID "waterQualiyResultId",
-               TOWR.RESULT_ID "outWharyResultId",
-               TOWR.RESULT_OUT_WHARY_NAME "resultOutPortName"
+            TLSR.BATCH_ID                    "batchId",
+            TLSR.RESULT_DELIVERY_DATE        "resultDeliveryDate",
+            TLSR.RESULT_ACTUAL_INSTALLATIONS "resultActualInstallations",
+            TLSR.RWAREHOUSE_MATERIAL_ID      "rwarehouseMaterialId",
+            TLSR.RESULT_ARRIVAL_PORT_TIME    "resultArrivalPortTime",
+            TLSR.RESULT_OUT_PORT_TIME        "resultOutPortTime",
+            TLSR.RESULT_LOAD_SHIP_DATE       "resultLoadShipDate",
+            TLSR.RESULT_ISCLEAR              "resultIsClear",
+            TWQR.RESULT_ES_DELIVERY_DATE    "planDeliveryDate",
+            TWQR.RESULT_PLANNED_DATE "planDate",
+            TWQR.RESULT_EMPTY_HEAVY_WATER_METER "resultHeavyWeight",
+            TWQR.RESULT_ID "waterQualiyResultId",
+            TOWR.RESULT_ID "outWharyResultId",
+            TOWR.RESULT_OUT_WHARY_NAME "resultOutPortName",
+            ADN.PORT_ID "sendPortId",
+            rp3.PORT_NAME "sendPortName",
+            ada.DOWN_SWIM_PORT_ID "startPortId",
+            rp1.PORT_NAME "startPortName",
+            ada.PORT_ID "endPortId",
+            rp2.PORT_NAME "endPortName",
+            BCR.UNIT_PRICE "waterUnitPrice",
+            TWQR.UNIT_PRICE_ID "unitPriceId",
+            TWQR.RESULT_INSPECTION_FEES "resultInspectionFees",
+            TWQR.RESULT_MOISTURE_CONTENT "resultMoistureContent",
+            TWQR.RESULT_WATER_TONNAGE "moistureTonnage",
+            TWQR.IS_NEED_ASSEMBLE "isNeedAssemble"
         FROM TMSSHIP_LOAD_SHIP_RESULT TLSR
-        left join TMSSHIP_WATER_QUALITY_RESULT TWQR
-        ON TLSR.TOTAL_RESULT_ID=TWQR.TOTAL_RESULT_ID
-        left join TMSSHIP_OUT_WHARY_RESULT TOWR
-        ON TOWR.TOTAL_RESULT_ID=TLSR.TOTAL_RESULT_ID
+                 left join TMSSHIP_WATER_QUALITY_RESULT TWQR
+                           ON TLSR.TOTAL_RESULT_ID=TWQR.TOTAL_RESULT_ID
+                 left join TMSSHIP_OUT_WHARY_RESULT TOWR
+                           ON TOWR.TOTAL_RESULT_ID=TLSR.TOTAL_RESULT_ID
+                 LEFT JOIN DIL_BATCH_INFACOTRY DBI ON DBI.BATCH_INFACOTRY_ID = TLSR.BATCH_ID
+                 LEFT JOIN DIL_BATCH db ON db.BATCH_ID = DBI.BATCH_ID
+                 LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada ON ada.BATCH_ID = DBI.BATCH_INFACOTRY_ID
+                 LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN ON ADN.BATCH_ID = ADA.BATCH_ID
+                 LEFT JOIN RMS_PORT RP3 ON RP3.PORT_ID = ADN.PORT_ID
+                 LEFT JOIN RMS_PORT rp1 ON ada.DOWN_SWIM_PORT_ID = rp1.PORT_ID
+                 LEFT JOIN RMS_PORT rp2 ON ada.PORT_ID = rp2.PORT_ID
+                 LEFT JOIN BMSSHIP_CONTRACT_PRICE BCR ON BCR.RESULT_ID=TWQR.UNIT_PRICE_ID
         WHERE TLSR.RESULT_ID = #{resultId}
     </select>
 

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

@@ -22,19 +22,21 @@
         <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
         <result column="WATER_UNIT_PRICE" jdbcType="DECIMAL" property="waterUnitPrice" />
         <result column="IS_NEED_ASSEMBLE" jdbcType="VARCHAR" property="isNeedAssemble" />
+        <result column="UNIT_PRICE_ID" jdbcType="DECIMAL" property="unitPriceId" />
     </resultMap>
     <sql id="columns">
         RESULT_ID, TOTAL_RESULT_ID, RESULT_PLANNED_DATE, RESULT_CARGO_RIGHTS_DATE, RESULT_SHIPMENT_RATIO,
     RESULT_EMPTY_HEAVY_WATER_METER, RESULT_MOISTURE_CONTENT, RESULT_WATER_TONNAGE, RESULT_INSPECTION_FEES,
     DELETE_NAME, DELETE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-    INSERT_UPDATE_REMARK, RESULT_ES_DELIVERY_DATE, DELETED, WATER_UNIT_PRICE, IS_NEED_ASSEMBLE
+    INSERT_UPDATE_REMARK, RESULT_ES_DELIVERY_DATE, DELETED, WATER_UNIT_PRICE, IS_NEED_ASSEMBLE,
+    UNIT_PRICE_ID
     </sql>
     <sql id="columns_alias">
         t.RESULT_ID, t.TOTAL_RESULT_ID, t.RESULT_PLANNED_DATE, t.RESULT_CARGO_RIGHTS_DATE,
     t.RESULT_SHIPMENT_RATIO, t.RESULT_EMPTY_HEAVY_WATER_METER, t.RESULT_MOISTURE_CONTENT,
     t.RESULT_WATER_TONNAGE, t.RESULT_INSPECTION_FEES, t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME,
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.RESULT_ES_DELIVERY_DATE,
-    t.DELETED, t.WATER_UNIT_PRICE, t.IS_NEED_ASSEMBLE
+    t.DELETED, t.WATER_UNIT_PRICE, t.IS_NEED_ASSEMBLE, t.UNIT_PRICE_ID
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM TMSSHIP_WATER_QUALITY_RESULT
@@ -104,6 +106,9 @@
             <if test="isNeedAssemble != null and isNeedAssemble != ''">
                 and IS_NEED_ASSEMBLE = #{isNeedAssemble}
             </if>
+            <if test="unitPriceId != null">
+                and UNIT_PRICE_ID = #{unitPriceId}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -168,6 +173,9 @@
             <if test="isNeedAssemble != null and isNeedAssemble != ''">
                 and IS_NEED_ASSEMBLE LIKE '%${isNeedAssemble}%'
             </if>
+            <if test="unitPriceId != null">
+                and UNIT_PRICE_ID = #{unitPriceId}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
@@ -234,6 +242,9 @@
         <if test="isNeedAssemble != null and isNeedAssemble != ''">
             or IS_NEED_ASSEMBLE = #{isNeedAssemble}
         </if>
+        <if test="unitPriceId != null">
+            or UNIT_PRICE_ID = #{unitPriceId}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.TmsshipWaterQualityResult">
         insert into TMSSHIP_WATER_QUALITY_RESULT (RESULT_ID, TOTAL_RESULT_ID, RESULT_PLANNED_DATE,
@@ -243,8 +254,8 @@
                                                   DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
                                                   INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
                                                   INSERT_UPDATE_REMARK, RESULT_ES_DELIVERY_DATE,
-                                                  DELETED, WATER_UNIT_PRICE, IS_NEED_ASSEMBLE
-        )
+                                                  DELETED, WATER_UNIT_PRICE, IS_NEED_ASSEMBLE,
+                                                  UNIT_PRICE_ID)
         values (#{resultId,jdbcType=DECIMAL}, #{totalResultId,jdbcType=DECIMAL}, #{resultPlannedDate,jdbcType=TIMESTAMP},
                 #{resultCargoRightsDate,jdbcType=TIMESTAMP}, #{resultShipmentRatio,jdbcType=DECIMAL},
                 #{resultEmptyHeavyWaterMeter,jdbcType=VARCHAR}, #{resultMoistureContent,jdbcType=DECIMAL},
@@ -252,8 +263,8 @@
                 #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
                 #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
                 #{insertUpdateRemark,jdbcType=VARCHAR}, #{resultEsDeliveryDate,jdbcType=TIMESTAMP},
-                #{deleted,jdbcType=DECIMAL}, #{waterUnitPrice,jdbcType=DECIMAL}, #{isNeedAssemble,jdbcType=VARCHAR}
-               )
+                #{deleted,jdbcType=DECIMAL}, #{waterUnitPrice,jdbcType=DECIMAL}, #{isNeedAssemble,jdbcType=VARCHAR},
+                #{unitPriceId,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmsshipWaterQualityResult">
         insert into TMSSHIP_WATER_QUALITY_RESULT
@@ -318,6 +329,9 @@
             <if test="isNeedAssemble != null">
                 IS_NEED_ASSEMBLE,
             </if>
+            <if test="unitPriceId != null">
+                UNIT_PRICE_ID,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="resultId != null">
@@ -380,6 +394,9 @@
             <if test="isNeedAssemble != null">
                 #{isNeedAssemble,jdbcType=VARCHAR},
             </if>
+            <if test="unitPriceId != null">
+                #{unitPriceId,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmsshipWaterQualityResult">
@@ -402,7 +419,8 @@
             RESULT_ES_DELIVERY_DATE = #{resultEsDeliveryDate,jdbcType=TIMESTAMP},
             DELETED = #{deleted,jdbcType=DECIMAL},
             WATER_UNIT_PRICE = #{waterUnitPrice,jdbcType=DECIMAL},
-            IS_NEED_ASSEMBLE = #{isNeedAssemble,jdbcType=VARCHAR}
+            IS_NEED_ASSEMBLE = #{isNeedAssemble,jdbcType=VARCHAR},
+            UNIT_PRICE_ID = #{unitPriceId,jdbcType=DECIMAL}
         where RESULT_ID = #{resultId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmsshipWaterQualityResult">
@@ -465,6 +483,9 @@
             <if test="isNeedAssemble != null">
                 IS_NEED_ASSEMBLE = #{isNeedAssemble,jdbcType=VARCHAR},
             </if>
+            <if test="unitPriceId != null">
+                UNIT_PRICE_ID = #{unitPriceId,jdbcType=DECIMAL},
+            </if>
         </set>
         where RESULT_ID = #{resultId,jdbcType=DECIMAL}
     </update>
@@ -491,8 +512,8 @@
         INSERT_TIME, UPDATE_USERNAME,
         UPDATE_TIME, INSERT_UPDATE_REMARK,
         RESULT_ES_DELIVERY_DATE, DELETED,
-        WATER_UNIT_PRICE, IS_NEED_ASSEMBLE
-        )
+        WATER_UNIT_PRICE, IS_NEED_ASSEMBLE,
+        UNIT_PRICE_ID)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.resultId,jdbcType=DECIMAL},
@@ -504,8 +525,8 @@
         #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
         #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
         #{item.resultEsDeliveryDate,jdbcType=TIMESTAMP}, #{item.deleted,jdbcType=DECIMAL},
-        #{item.waterUnitPrice,jdbcType=DECIMAL}, #{item.isNeedAssemble,jdbcType=VARCHAR}
-        from dual
+        #{item.waterUnitPrice,jdbcType=DECIMAL}, #{item.isNeedAssemble,jdbcType=VARCHAR},
+        #{item.unitPriceId,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -591,6 +612,10 @@
         <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.isNeedAssemble,jdbcType=VARCHAR}
         </foreach>
+        ,UNIT_PRICE_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.unitPriceId,jdbcType=DECIMAL}
+        </foreach>
         where RESULT_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.resultId,jdbcType=DECIMAL}