fix:[填报管理]优化

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java

@@ -1504,6 +1504,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                     if (gyzj != null) {
                         studyFormFillResource.setMc(gyzj.getMc()); studyFormFillResource.setNd(gyzj.getNd());studyFormFillResource.setNddw(gyzj.getNddw()); studyFormFillResource.setLy(gyzj.getLy());
                         studyFormFillResource.setSxrq(gyzj.getSxrq() != null?DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", gyzj.getSxrq()):"");
+                        studyFormFillResource.setNd(gyzj.getNd());
+                        studyFormFillResource.setNddw(gyzj.getNddw());
+                        studyFormFillResource.setLy(gyzj.getLy());
                         String syl = studyFormFillResource.getSyl();
                         if (StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) {
                             String kc = CalUnitTools.subTj(gyzj.getKc(), gyzj.getKcdw(), syl, studyFormFillResource.getSyldw());

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java

@@ -1279,6 +1279,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                     if (mjy != null) {
                         studyFormFillResource.setMc(mjy.getMc());studyFormFillResource.setNd(mjy.getNd());studyFormFillResource.setNddw(mjy.getNddw());studyFormFillResource.setLy(mjy.getLy());
                         studyFormFillResource.setSxrq(mjy.getSxrq() != null?DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", mjy.getSxrq()):"");
+                        studyFormFillResource.setNd(mjy.getNd());
+                        studyFormFillResource.setNddw(mjy.getNddw());
+                        studyFormFillResource.setLy(mjy.getLy());
                         String syl = studyFormFillResource.getSyl();
                         if (StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) {
                             String kc = CalUnitTools.subTj(mjy.getKc(), mjy.getKcdw(), syl, studyFormFillResource.getSyldw());

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java

@@ -703,6 +703,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
                     if (sj != null) {
                         studyFormFillResource.setMc(sj.getMc());studyFormFillResource.setNd(sj.getNd());studyFormFillResource.setNddw(sj.getNddw());studyFormFillResource.setPh(sj.getPh());studyFormFillResource.setLy(sj.getLy());
                         studyFormFillResource.setSxrq(sj.getSxr() != null?DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", sj.getSxr()):"");
+                        studyFormFillResource.setNd(sj.getNd());
+                        studyFormFillResource.setNddw(sj.getNddw());
+                        studyFormFillResource.setLy(sj.getLy());
                         syl(studyFormFillResource, sj, jcgjList, tzList, qmr);
                         sjMap.put(sj.getBh(), sj);
                     }