Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PowerStationMapper.xml

@@ -33,6 +33,7 @@
     <if test="processStatus != null and processStatus != ''">
         and hygf_power_station.process_status = #{processStatus}
     </if>
+    GROUP BY hygf_peasant_household.sequence_nbr
     ORDER BY hygf_power_station.rec_date desc
     ) a
 </select>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java

@@ -873,7 +873,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         PeasantHousehold peasantHousehold = new PeasantHousehold();
         BeanUtils.copyProperties(model, peasantHousehold);
         peasantHousehold.setSequenceNbr(null);
-        model.setCreationTime(new Date());
+        peasantHousehold.setCreationTime(new Date());
         peasantHousehold.setConstructionState(ArrivalStateeEnum.待勘察.getCode());
         this.save(peasantHousehold);
         //生成合同