Преглед на файлове

产品实绩管理 修正值有不进行更新覆盖

@zhangxiaoyu122 преди 3 години
родител
ревизия
271c11c1e8
променени са 1 файла, в които са добавени 19 реда и са изтрити 5 реда
  1. 19 5
      src/main/java/com/steerinfo/ems/trmworkprocproductvalue/service/impl/TRmWorkprocProductValueServiceImpl.java

+ 19 - 5
src/main/java/com/steerinfo/ems/trmworkprocproductvalue/service/impl/TRmWorkprocProductValueServiceImpl.java

@@ -67,7 +67,7 @@ public class TRmWorkprocProductValueServiceImpl extends BaseServiceImpl<TRmWorkp
     ITRmProductService tRmProductService;
     @Autowired
     ITRmWorkprocService tRmWorkprocService;
-    
+
     @Override
     protected IBaseMapper<TRmWorkprocProductValue, HashMap<String, Object>> getMapper() {
         return tRmWorkprocProductValueMapper;
@@ -821,7 +821,7 @@ public class TRmWorkprocProductValueServiceImpl extends BaseServiceImpl<TRmWorkp
     public Map<String, BigDecimal> getOutPut(HashMap<String, Object> params) {
         return tRmWorkprocProductValueMapper.getOutPut(params);
     }
-    
+
     public Map<String,BigDecimal>getOutPut(String workprocid,String clock,String timegranid,String itemtype){
     	HashMap<String, Object> maps = new HashMap<>();
     	maps.put("workprocid", workprocid);
@@ -1195,9 +1195,23 @@ public class TRmWorkprocProductValueServiceImpl extends BaseServiceImpl<TRmWorkp
 			tRmWorkprocProductValue.setBz("计算值是湿基;最终值是干基");
 			tRmWorkprocProductValue.setUserid("系统");
 			tRmWorkprocProductValue.setUpdatetime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
-			if(tRmWorkprocProductValueMapper.updateByPrimaryKeySelective(tRmWorkprocProductValue)==0){
-				tRmWorkprocProductValueMapper.insertSelective(tRmWorkprocProductValue);
-			};
+
+			//数据库是否有值,并且修正值有值不对他进行修正
+			HashMap<String, Object> hpm = new HashMap<String, Object>();
+			hpm.put("clock", tRmWorkprocProductValue.getClock());
+			hpm.put("itemid",  tRmWorkprocProductValue.getItemid());
+			hpm.put("timegranid", "DAY");
+			hpm.put("itemtype", "R");
+
+			TRmWorkprocProductValue exit = tRmWorkprocProductValueMapper.selectByPrimaryKey(hpm);
+			if(exit!=null && exit.getCorrectvalue()!=null && exit.getCorrectvalue().compareTo(BigDecimal.ZERO)!=0){
+				//存在并且有修正值不进行更新
+			}else{
+				if(tRmWorkprocProductValueMapper.updateByPrimaryKeySelective(tRmWorkprocProductValue)==0){
+					tRmWorkprocProductValueMapper.insertSelective(tRmWorkprocProductValue);
+				};
+			}
+
 		}
 	}