update---水人工录入自动计算

src/main/java/com/steerinfo/ems/emscalpointvalue/service/impl/EmsCalpointValueServiceImpl.java

@@ -1,31 +1,25 @@
 package com.steerinfo.ems.emscalpointvalue.service.impl;
 
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.framework.service.pagehelper.PageHelper;
-import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.ems.emscalpointvalue.model.EmsCalpointValue;
 import com.steerinfo.auth.utils.JwtUtil;
 import com.steerinfo.ems.emscalpointvalue.mapper.EmsCalpointValueMapper;
+import com.steerinfo.ems.emscalpointvalue.model.EmsCalpointValue;
 import com.steerinfo.ems.emscalpointvalue.service.IEmsCalpointValueService;
 import com.steerinfo.ems.formula.service.IFormulaService;
 import com.steerinfo.ems.trmcalpoint.mapper.TRmCalpointMapper;
 import com.steerinfo.ems.trmcalpoint.model.TRmCalpoint;
-import com.steerinfo.ems.trmcalpoint.service.ITRmCalpointService;
 import com.steerinfo.ems.trmcalpointvalue.mapper.TRmCalpointValueMapper;
 import com.steerinfo.ems.trmcalpointvalue.model.TRmCalpointValue;
-
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * EmsCalpointValue服务实现：
@@ -104,7 +98,8 @@ public class EmsCalpointValueServiceImpl extends BaseServiceImpl<EmsCalpointValu
 			emsCalpointValueMapper.updateByPrimaryKeySelective(nx);
 		}
 		
-		if(c == null || c.getEnergytypeid().equalsIgnoreCase("W")) {
+		//if(c == null || c.getEnergytypeid().equalsIgnoreCase("W")) {
+		if(c == null) {
 			return;
 		}
 		
@@ -115,7 +110,7 @@ public class EmsCalpointValueServiceImpl extends BaseServiceImpl<EmsCalpointValu
 		if(t!=null && model.getApportvalue()!=null){
 			t.setApportvalue(model.getApportvalue());
 			t.setCorrectvalue(model.getApportvalue().subtract(t.getActualvalue()==null?BigDecimal.ZERO:t.getActualvalue()));
-			if(model.getBz()!=null){
+			if(model.getBz()!=null && model.getBz()!=""){
 				t.setBz(model.getBz());
 			}else{
 				t.setBz("人工录入，自动修改");