Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev

itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java

@@ -893,8 +893,12 @@ public class DataLogTools {
 					flag = isString?StringUtils.isNotEmpty((String)oldVal):true;
 				}else if(newVal!=null && oldVal==null) {
 					flag = isString?StringUtils.isNotEmpty((String)newVal):true;
-				}else if(newVal!=null && oldVal!=null && !newVal.equals(oldVal)) {
+				}else if(newVal!=null && oldVal!=null) {
-					flag = true;
+					if(BigDecimal.class.equals(item.getJavaType())){
+						flag = ((BigDecimal)newVal).compareTo((BigDecimal)oldVal) != 0;
+					}else{
+						flag = !newVal.equals(oldVal);
+					}
 				}
 				change.setOldValue(parseValue(oldVal,item.getJavaType()));
 				change.setNewValue(parseValue(newVal,item.getJavaType()));
@@ -1288,7 +1292,4 @@ public class DataLogTools {
 		return sql.replaceAll(SQL_PLACEHOLDER,tableName);
 	}
 
-
-
-
 }

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngMeaPurIntVo.java

@@ -56,6 +56,9 @@ public class LngMeaPurIntVo extends com.xjrsoft.common.model.base.BaseModel{
     private Object dateMea;
     
     
+    @ApiModelProperty("卸港eta")
+    private Object dateEta;
+    
     /**
     * 热值（MMBtu）
     */
@@ -182,6 +185,12 @@ public class LngMeaPurIntVo extends com.xjrsoft.common.model.base.BaseModel{
     private Long deptId;
     
     private Long deptName;
+    
+    private String comName;
+    
+    private String staName;
+    
+    
     /**
     * 数据权限id
     */

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/DemandController.java

@@ -20,6 +20,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
+import com.pictc.enums.BusinessCode;
+import com.xjrsoft.common.exception.BusinessException;
 import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.ExcelUtil;
@@ -32,6 +34,7 @@ import com.xjrsoft.module.dayPlan.vo.LngPngDemandPageVo;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -81,6 +84,9 @@ public class DemandController {
     @ApiOperation(value = "新增LngPngDemand")
     @SaCheckPermission("demand:add")
     public R add(@Valid @RequestBody UpdateLngPngDemandDto dto){
+    	    if(StrUtil.isBlank(dto.getCuCode())) {
+    	    		throw new BusinessException(BusinessCode.of(10500,"客户编码不能为空！"));
+    	    }
     	    return R.ok(demandService.add(dto));
     }
 
@@ -88,6 +94,9 @@ public class DemandController {
     @ApiOperation(value = "编辑LngPngDemand")
     @SaCheckPermission("demand:edit")
     public R update(@Valid @RequestBody UpdateLngPngDemandDto dto){
+	    	if(StrUtil.isBlank(dto.getCuCode())) {
+	    		throw new BusinessException(BusinessCode.of(10500,"客户编码不能为空！"));
+	    }
     	    demandService.update(dto);
     	    return R.ok();
     }
@@ -96,6 +105,9 @@ public class DemandController {
     @ApiOperation(value = "保存并提交LngPngDemand")
     //@SaCheckPermission("demand:edit")
     public R saveAndSubmit(@Valid @RequestBody UpdateLngPngDemandDto dto){
+	    	if(StrUtil.isBlank(dto.getCuCode())) {
+	    		throw new BusinessException(BusinessCode.of(10500,"客户编码不能为空！"));
+	    }
       	demandService.saveAndSubmit(dto);
 	    return R.ok();
     }

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/mapper/LngMeaPurIntMapper.java

@@ -19,7 +19,7 @@ import com.xjrsoft.module.ship.vo.LngShipScheduleVo;
 public interface LngMeaPurIntMapper extends BaseMapper<LngMeaPurInt> {
 	
 	@Select("SELECT mpi.*,k.k_name,k.K_no,NVL(com.short_name,com.name) AS com_name  ,"
-			+ "     opi.ss_no,opi.su_code,opi.su_name,"
+			+ "     opi.ss_no,opi.su_code,opi.su_name,opi.date_eta as dateEta,"
 			+ "     sl.full_name AS sta_name, dd_m.name AS ss_type_name"
 			+ "     FROM  lng_mea_pur_int mpi "
 			+ "     LEFT JOIN lng_ops_pur_int opi ON opi.id=mpi.ops_id  "