Merge branch 'develp' of com_yunfei_saas/agmp-tss into master

src/main/java/com/yunfeiyun/agmp/tss/service/impl/AgmTaskpickServiceImpl.java

@@ -582,9 +582,9 @@ public class AgmTaskpickServiceImpl implements IAgmTaskpickService {
                         ? fmsTaskResVo.getTaskPlanenddate() : fmsTaskResVo.getTaskCompletedate();
                 goodsperiodrcd.setGoodsperiodrcdStartdate(startTime1);
                 goodsperiodrcd.setGoodsperiodrcdEnddate(endTime1);
-                goodsperiodrcd.setGoodsperiodrcdFmstaskcreateddate(fmsTaskResVo.getTaskCreateddate());
+                goodsperiodrcd.setGoodsperiodrcdFmstaskcreateddate(fmsTaskResVo.getTaskPlanstartdate());
                 goodsperiodrcd.setGoodsperiodrcdFmstaskmanagername(fmsTaskResVo.getTaskManagername());
-                goodsperiodrcd.setGoodsperiodrcdFmstaskremark(fmsTaskResVo.getTaskContent());
+                goodsperiodrcd.setGoodsperiodrcdFmstaskremark(fmsTaskResVo.getTaskTypeContent());
                 goodsperiodrcd.setTid(reqVo.getTid());
                 addList.add(goodsperiodrcd);
 
@@ -634,9 +634,9 @@ public class AgmTaskpickServiceImpl implements IAgmTaskpickService {
                             ? fmsTaskResVo.getTaskPlanenddate() : fmsTaskResVo.getTaskCompletedate();
                     goodsperiodrcd.setGoodsperiodrcdStartdate(startTime1);
                     goodsperiodrcd.setGoodsperiodrcdEnddate(endTime1);
-                    goodsperiodrcd.setGoodsperiodrcdFmstaskcreateddate(fmsTaskResVo.getTaskCreateddate());
+                    goodsperiodrcd.setGoodsperiodrcdFmstaskcreateddate(fmsTaskResVo.getTaskPlanstartdate());
                     goodsperiodrcd.setGoodsperiodrcdFmstaskmanagername(fmsTaskResVo.getTaskManagername());
-                    goodsperiodrcd.setGoodsperiodrcdFmstaskremark(fmsTaskResVo.getTaskContent());
+                    goodsperiodrcd.setGoodsperiodrcdFmstaskremark(fmsTaskResVo.getTaskTypeContent());
                     addList.add(goodsperiodrcd);
 
                     //图片资源处理

src/main/java/com/yunfeiyun/agmp/tss/service/impl/TssTracecodeapplyServiceImpl.java

@@ -407,7 +407,7 @@ public class TssTracecodeapplyServiceImpl implements ITssTracecodeapplyService {
     }
     public  void packageSourcePeriodInfo(JSONObject result,List<TssSourceperiod> periods,String tid){
         List<JSONObject> tssSourceperiodList = periods.stream().sorted(Comparator.comparing(TssSourceperiod::getSourceperiodFmstaskrcdcreateddate)).map(item->{
-            List<SysRes> sysResList = sysResService.selectResByBusIdAndTid(item.getSourceperiodId(),ResConstants.BizType.PERIOD.getKey(),tid );
+            List<SysRes> sysResList = sysResService.selectResByBusIdAndTid(item.getSourceperiodId(),ResConstants.BizType.SOURCE_INFO_PERIOD.getKey(),tid );
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("id",item.getSourceperiodId());
             jsonObject.put("date",item.getSourceperiodFmstaskrcdcreateddate());
@@ -420,7 +420,7 @@ public class TssTracecodeapplyServiceImpl implements ITssTracecodeapplyService {
     }
     public  void packageGoodsPeriodInfo(JSONObject result,List<TssGoodsperiodrcd> periods,String  tid){
         List<JSONObject> tssSourceperiodList = periods.stream().sorted(Comparator.comparing(TssGoodsperiodrcd::getGoodsperiodrcdFmstaskcreateddate)).map(item->{
-            List<SysRes> sysResList = sysResService.selectResByBusIdAndTid(item.getGoodsperiodrcdId(),ResConstants.BizType.PERIOD.getKey(),tid);
+            List<SysRes> sysResList = sysResService.selectResByBusIdAndTid(item.getGoodsperiodrcdId(),ResConstants.BizType.SOURCE_INFO_PERIOD.getKey(),tid);
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("id",item.getGoodsperiodrcdId());
             jsonObject.put("date",item.getGoodsperiodrcdFmstaskcreateddate());