发货管理优化

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PreparationMoneyMapper.java

@@ -13,6 +13,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 发货单 Mapper 接口
@@ -28,4 +29,11 @@ public interface PreparationMoneyMapper extends BaseMapper<PreparationMoney> {
     @UserEmpower(field ={"regional_companies_code"} ,dealerField={"amos_unit_org_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     List<PreparationMoney> selectPageList(@Param(value = "dto") PreparationDto preparationDto);
 
+    @UserEmpower(field ={"regional_companies_code"} ,dealerField={"amos_unit_org_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<Map<String,Object>> preparationStation (@Param(value = "preparationMoneyState")  String preparationMoneyState,
+                                                 @Param(value = "ownersName") String ownersName,
+                                                 @Param(value = "regionalcompaniesSeq") String regionalcompaniesSeq,
+                                                 @Param(value = "developerId") String developerId,
+                                                 @Param(value = "state") String state);
+
 }

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

@@ -39,4 +39,46 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
         </where>
         ORDER BY order_time DESC
     </select>
+
+    <select id="preparationStation" resultType="java.util.Map">
+        select
+        hygf_peasant_household.peasant_household_no as peasantHouseholdNo,
+        hygf_peasant_household.owners_name as ownersName,
+        hygf_peasant_household.regional_companies_name as regionalCompaniesName,
+        hygf_peasant_household.developer_name as developerName,
+        hygf_peasant_household.sequence_nbr  as sequenceNbr,
+        concat_ws('/',project_address_name,project_address_detail) as address,
+        hygf_peasant_household.project_address_name  as sequenceNbr,
+        hygf_peasant_household.preparation_money_state preparationMoneyState,
+        hygf_document_station.preparation_money_id as preparationMoneyId,
+        hygf_power_station.process_instance_id as instanceId
+        from
+        hygf_peasant_household
+        LEFT JOIN hygf_document_station on  hygf_peasant_household.sequence_nbr =   hygf_document_station.station_id
+        LEFT JOIN hygf_power_station on hygf_peasant_household.sequence_nbr = hygf_power_station.peasant_household_id
+        <where>
+        <if test="preparationMoneyState!=null and preparationMoneyState !='' and preparationMoneyState == '0' ">
+            and hygf_peasant_household.preparation_money_state in ('待发货','待补货','暂存发货')
+        </if>
+        <if test="regionalCompaniesSeq!=null and regionalCompaniesSeq !=''  ">
+            and hygf_peasant_household.regional_companies_seq  = #{regionalCompaniesSeq}
+        </if>
+        <if test="developerId!=null and developerId !=''">
+            and hygf_peasant_household.developer_id = #{developerId}
+        </if>
+        <if test="state!=null and state !=''">
+            and hygf_peasant_household.preparation_money_state  = #{state}
+        </if>
+        <if test="ownersName!=null and ownersName !=''">
+            and hygf_peasant_household.owners_name like concat ('%',#{ownersName},'%')
+        </if>
+        <if test="preparationMoneyState!=null and preparationMoneyState !='' and preparationMoneyState == '1' ">
+            and hygf_peasant_household.preparation_money_state not in  ('待发货','待补货','暂存发货') and preparation_money_state is not and preparation_money_state != ''
+        </if>
+
+
+        </where>
+
+
+    </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PreparationMoneyController.java

@@ -71,8 +71,8 @@ public class PreparationMoneyController extends BaseController {
 	@GlobalTransactional
 	public ResponseModel<PreparationMoney> save( @RequestParam("isSubmit") String isSubmit, @RequestBody PreparationMoney model) {
         AgencyUserModel agencyUserModel= getUserInfo();
-	 //   model = preparationMoneyServiceImpl.saveOrUpdateObjectNew(model,agencyUserModel, isSubmit);
-	    model = preparationMoneyServiceImpl.saveOrUpdateObject(model,agencyUserModel);
+	   model = preparationMoneyServiceImpl.saveOrUpdateObjectNew(model,agencyUserModel, isSubmit);
+		//   model = preparationMoneyServiceImpl.saveOrUpdateObject(model,agencyUserModel);
 	    return ResponseHelper.buildResponse(model);
 	}
 
@@ -266,9 +266,10 @@ public class PreparationMoneyController extends BaseController {
 	@PostMapping(value = "/excuteFlow")
 	@ApiOperation(httpMethod = "POST",value = "收货审核",  notes = "收货审核")
 	@GlobalTransactional
-	public ResponseModel excuteFlow(@RequestParam(value = "instanceId") String instanceId, @RequestBody Map<String, Object> kv) {
+	public ResponseModel excuteFlow(@RequestParam(value = "instanceId" ,required = false) String instanceId,
+									@RequestParam(value = "sequenceNbr") Long sequenceNbr,@RequestBody Map<String, Object> kv) {
 
-		preparationMoneyServiceImpl.excuteFlow(instanceId,kv);
+		preparationMoneyServiceImpl.excuteFlow(instanceId,kv,sequenceNbr);
 		return CommonResponseNewUtil.failure();
 	}
 
@@ -276,11 +277,10 @@ public class PreparationMoneyController extends BaseController {
 	@PostMapping(value = "/replenishmentSubmit")
 	@ApiOperation(httpMethod = "POST",value = "补货申请",  notes = "补货申请")
 	@GlobalTransactional
-	public ResponseModel replenishmentSubmit(@RequestParam(value = "sequenceNbr") Long sequenceNbr, @RequestBody HygfReplenishment hygfReplenishment) {
+	public ResponseModel replenishmentSubmit( @RequestBody HygfReplenishment hygfReplenishment) {
 
-		hygfReplenishment.setPreparationMoneyId(sequenceNbr);
 		hygfReplenishmentService.save(hygfReplenishment);
-		preparationMoneyServiceImpl.replenishmentSubmit(sequenceNbr);
+		preparationMoneyServiceImpl.replenishmentSubmit(hygfReplenishment.getPreparationMoneyId());
 		return CommonResponseNewUtil.failure();
 	}
 
@@ -303,4 +303,20 @@ public class PreparationMoneyController extends BaseController {
 		preparationMoneyServiceImpl.replenishmentAudit(sequenceNbr,kv);
 		return CommonResponseNewUtil.failure();
 	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/preparationStation")
+	@ApiOperation(httpMethod = "GET",value = "发货电站",  notes = "发货电站")
+	@GlobalTransactional
+	public ResponseModel<IPage<Map<String,Object>>> preparationStation(
+			@RequestParam(value = "current") Integer current,
+			@RequestParam(value = "size") Integer size,
+			@RequestParam(value = "ownersName",required = false) String ownersName,
+			@RequestParam(value = "regionalcompaniesSeq",required = false) String regionalcompaniesSeq,
+			@RequestParam(value = "developerId",required = false) String developerId,
+			@RequestParam(value = "state",required = false) String state,
+			@RequestParam(value = "preparationMoneyState") String preparationMoneyState){
+
+		return ResponseHelper.buildResponse(preparationMoneyServiceImpl.preparationStation(current,size,preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state)) ;
+	}
 }

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

@@ -37,6 +37,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -849,10 +850,9 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         }
     }
 
-    public void excuteFlow( String instanceId, Map<String, Object> kv) {
-
-        PreparationMoney model = (PreparationMoney) Bean.mapToBean(kv, PreparationMoney.class);
+    public void excuteFlow( String instanceId, Map<String, Object> kv,Long sequenceNbr) {
 
+        PreparationMoney model = preparationMoneyMapper.selectById(sequenceNbr);
 
         model.setDeliveryState(ArrivalStateeEnum.已收货.getCode());
         //更新电站施工状态
@@ -1013,5 +1013,18 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
 
     }
 
+    public IPage<Map<String,Object>> preparationStation(Integer current, Integer size, String preparationMoneyState,String ownersName,String regionalcompaniesSeq,String developerId,String state){
+
+
+         PageHelper.startPage(current,  size);
+         List<Map<String, Object>> resultPage = preparationMoneyMapper.preparationStation(preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state);
+         PageInfo<Map<String, Object>> page = new PageInfo(resultPage);
+         Page<Map<String, Object>> pagenew = new Page<>();
+         pagenew.setTotal(page.getTotal());
+         pagenew.setSize(size);
+         pagenew.setRecords(page.getList());
+         pagenew.setCurrent(current);
+         return pagenew;
+     }
 
 }
\ No newline at end of file