Skip to content

A
amos-boot-zx-biz
Commit 6e144e44 authored by lilongyang's avatar lilongyang
Browse files
Options

Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

parents 8f4c5cc0 6be1d267
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 50 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PeasantHouseholdMapper.java
View file @ 6e144e44
......@@ -29,17 +29,23 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
);
@UserEmpower(field={},dealerField={"developer_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"eq","in","eq"} ,relationship="and")
List<PeasantHousehold> queryForPage( String developerCode,String ownersName,Long developerId,Integer isCertified,String preparationMoneyState);
List<PeasantHousehold> queryForPage( String developerCode,String ownersName,Long developerId,Integer isCertified,String preparationMoneyState, String peasantHouseholdNo);
List<Map<String,Object>> selectUserIsHouse(String telephone);
Integer selectIsAllRevoke(String amosUserId);
Integer selectIsAllRevoke(String peasantHouseholdNo);
void deleteHphByUserId(String userId);
void deletePauByUserId(String userId);
void deleteAliByUserId(String userId);
void deleteHhcByUserId(String userId);
Integer selectSurveyOrNot(String sequenceNbr);
PeasantHousehold selectReview(String sequenceNbr);
Integer selectPowerStationNumber(String amosUserId);
void deleteHphByNo(String peasantHouseholdNo);
void deleteHhcByNo(String peasantHouseholdNo);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PeasantHouseholdMapper.xml
View file @ 6e144e44
......@@ -68,6 +68,9 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
<if test="developerCode!=null and developerCode !=''">
and developer_code = #{developerCode}
</if>
<if test="peasantHouseholdNo!=null and peasantHouseholdNo !=''">
and peasant_household_no = #{peasantHouseholdNo}
</if>
ORDER BY creation_time DESC
</select>
<select id="selectUserIsHouse" resultType="java.util.Map">
......@@ -81,19 +84,19 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
`user`.MOBILE = #{telephone}
</select>
<select id="selectSurveyOrNot" resultType="Integer">
select survey_or_not from hygf_peasant_household where sequence_nbr = #{sequenceNbr}
<select id="selectReview" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold">
select review, amos_user_id from hygf_peasant_household where sequence_nbr = #{sequenceNbr}
</select>
<select id="selectIsAllRevoke" resultType="Integer">
SELECT
count(*) = ( SELECT count(*) FROM hygf_household_contract WHERE project_user_id = #{amosUserId} and initiate_status = '已发起' AND STATUS = '已作废' )
count(*) = ( SELECT count(*) FROM hygf_household_contract WHERE peasant_household_number = #{peasantHouseholdNo} and initiate_status = '已发起' AND STATUS = '已作废' )
FROM
hygf_household_contract
WHERE
project_user_id = #{amosUserId} and initiate_status = '已发起'
peasant_household_number = #{peasantHouseholdNo} and initiate_status = '已发起'
</select>
<select id="deleteHphByUserId">
......@@ -112,4 +115,16 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
DELETE FROM hygf_household_contract WHERE project_user_id=#{userId}
</select>
<select id="selectPowerStationNumber" resultType="Integer">
select count(*) from hygf_peasant_household where amos_user_id = #{amosUserId}
</select>
<select id="deleteHphByNo">
DELETE FROM hygf_peasant_household WHERE peasant_household_no=#{peasantHouseholdNo}
</select>
<select id="deleteHhcByNo">
DELETE FROM hygf_household_contract WHERE peasant_household_number=#{peasantHouseholdNo}
</select>
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/WorkOrderMapper.xml
View file @ 6e144e44
......@@ -66,11 +66,6 @@
LEFT JOIN hygf_peasant_household on hygf_peasant_household.sequence_nbr=hygf_work_order_power_station.peasant_household_id
LEFT JOIN hygf_power_station_engineering_info on hygf_power_station_engineering_info.work_order_power_station_id=hygf_work_order_power_station.sequence_nbr
ORDER BY
FIELD(hygf_work_order_power_station.power_station_construction_status, '待登记', '待审核', '已完成'),
hygf_power_station_engineering_info.completion_date DESC
<where>
<if test="dto.workOrderId!=null and dto.workOrderId!=''">
......@@ -115,9 +110,10 @@
</if>
ORDER BY
FIELD(hygf_work_order_power_station.power_station_construction_status, '待施工', '施工中', '待登记', '登记中', '待审核', '审核中', '未通过', '已完工'),
hygf_power_station_engineering_info.completion_date DESC,
FIELD(hygf_work_order_power_station.power_station_construction_status, '待施工', '施工中', '待登记', '登记中', '待审核', '审核中', '未通过', '已完工')
hygf_work_order_power_station.rec_date DESC
</where>
</select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PeasantHouseholdController.java
View file @ 6e144e44
......@@ -209,7 +209,8 @@ public class PeasantHouseholdController extends BaseController {
@RequestParam(value = "size") int size,
@RequestParam(value = "ownersName",required = false)String ownersName,
@RequestParam(value = "preparationMoneyState",required = false)String preparationMoneyState,
@RequestParam(value = "developerId",required = false)Long developerId) {
@RequestParam(value = "developerId",required = false)Long developerId,
@RequestParam(value = "peasantHouseholdNo",required = false) String peasantHouseholdNo) {
Page<PeasantHousehold> page = new Page<PeasantHousehold>();
page.setCurrent(current);
page.setSize(size);
......@@ -222,7 +223,7 @@ public class PeasantHouseholdController extends BaseController {
// String orgCode = userUnitInformationDto.getAmosDealerOrgCode();
Integer isCertified = PeasantHouseholdEnum.已认证.getCode();
return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdPage(page, null,ownersName,developerId,isCertified,preparationMoneyState));
return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdPage(page, null,ownersName,developerId,isCertified,preparationMoneyState, peasantHouseholdNo));
}
/**
......@@ -283,13 +284,13 @@ public class PeasantHouseholdController extends BaseController {
/**
* 根据sequenceNbr和userId删除用户信息
* sequenceNbr 唯一标识
* @param userId 用户id
* @param peasantHouseholdNo 电站编号
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}/{userId}")
@ApiOperation(httpMethod = "DELETE",value = "根据userId删除用户信息和合同", notes = "根据userId删除用户信息和合同")
public ResponseModel<Boolean> deleteUser(@PathVariable String sequenceNbr, @PathVariable String userId) {
return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.deleteUser(sequenceNbr, userId));
@DeleteMapping(value = "/{sequenceNbr}/{peasantHouseholdNo}")
@ApiOperation(httpMethod = "DELETE",value = "根据场站编号删除用户信息和合同", notes = "根据场站编号删除用户信息和合同")
public ResponseModel<Boolean> deleteUser(@PathVariable String sequenceNbr, @PathVariable String peasantHouseholdNo) {
return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.deleteUser(sequenceNbr, peasantHouseholdNo));
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/FinancingInfoServiceImpl.java
View file @ 6e144e44
......@@ -241,11 +241,16 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
if (!CollectionUtils.isEmpty(financingInfos)) {
FinancingInfo financingInfo = financingInfos.get(0);
financingInfo.setStatus("待推送");
financingInfo.setFinancingCompaniesCode(null);
financingInfo.setFinancingCompaniesSeq(null);
financingInfo.setFinancingCompaniesName(null);
this.updateById(financingInfo);
LambdaQueryWrapper<FinancingAuditing> wrapper = new LambdaQueryWrapper();
wrapper.eq(FinancingAuditing::getPeasantHouseholdId,financingInfo.getPeasantHouseholdId());
financingAuditingService.getBaseMapper().delete(wrapper);
LambdaQueryWrapper<FinancingRectificationOrder> wrapper1 = new LambdaQueryWrapper();
wrapper1.eq(FinancingRectificationOrder::getPeasantHouseholdId,financingInfo.getPeasantHouseholdId());
financingRectificationOrderService.getBaseMapper().delete(wrapper1);
this.deleteBySeq(financingInfo.getSequenceNbr());
}
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java
View file @ 6e144e44
......@@ -228,18 +228,18 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
* 分页查询
*/
public Page<PeasantHousehold> queryForPeasantHouseholdPage(Page<PeasantHousehold> page,String developerCode, String ownersName,Long developerId, Integer isCertified,String preparationMoneyState) {
public Page<PeasantHousehold> queryForPeasantHouseholdPage(Page<PeasantHousehold> page,String developerCode, String ownersName,Long developerId, Integer isCertified,String preparationMoneyState, String peasantHouseholdNo) {
int current = (int)page.getCurrent();
int size = (int)page.getSize();
PageHelper.startPage(current,size);
List<PeasantHousehold> records = peasantHouseholdMapper.queryForPage( developerCode,ownersName,developerId, isCertified,preparationMoneyState);
List<PeasantHousehold> records = peasantHouseholdMapper.queryForPage( developerCode,ownersName,developerId, isCertified,preparationMoneyState, peasantHouseholdNo);
PageInfo<PeasantHousehold> objectPageInfo = new PageInfo<PeasantHousehold>(records);
List<PeasantHousehold> newRecords = records.stream().map(item -> {
// 查询该条数据能否被删除, 0不能删除, 1可以删除
item.setIsAllRevoke(peasantHouseholdMapper.selectIsAllRevoke(item.getAmosUserId()));
item.setIsAllRevoke(peasantHouseholdMapper.selectIsAllRevoke(item.getPeasantHouseholdNo()));
if(item.getSurveyOrNot() != null){
......@@ -795,37 +795,45 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
}
@Override
public Boolean deleteUser(String sequenceNbr, String userId) {
try {
public Boolean deleteUser(String sequenceNbr, String peasantHouseholdNo) {
// try {
// 根据sequenceNbr获取农户勘察状态
Integer surveyOrNot = peasantHouseholdMapper.selectSurveyOrNot(sequenceNbr);
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectReview(sequenceNbr);
if(surveyOrNot != 0) {
throw new BadRequest("该用户已勘察, 不允许删除！");
if(peasantHousehold.getReview() != 0) {
throw new BadRequest("该电站已发起流程, 无法删除！");
}
// 查询该条数据能否被删除, 0不能删除, 1可以删除
Integer isAllRevok = peasantHouseholdMapper.selectIsAllRevoke(userId);
// 查询该条数据能否被删除, 0不能删除, 1可以删除
Integer isAllRevok = peasantHouseholdMapper.selectIsAllRevoke(peasantHouseholdNo);
if(isAllRevok != 1) {
throw new BadRequest("该用户有未完成的任务, 不允许删除！");
throw new BadRequest("该用户有未完成的任务, 无法删除！");
}
// 删除hygf_peasant_household表中数据
peasantHouseholdMapper.deleteHphByUserId(userId);
// 删除privilege_agency_user表中数据
peasantHouseholdMapper.deletePauByUserId(userId);
// 删除auth_login_info表中数据
peasantHouseholdMapper.deleteAliByUserId(userId);
// 删除hygf_household_contract表中数据
peasantHouseholdMapper.deleteHhcByUserId(userId);
// 查询当前用户名下的电站数量
Integer powerStationNumber = peasantHouseholdMapper.selectPowerStationNumber(peasantHousehold.getAmosUserId());
if(powerStationNumber > 1) {
// 删除hygf_peasant_household表中数据
peasantHouseholdMapper.deleteHphByNo(peasantHouseholdNo);
// 删除hygf_household_contract表中数据
peasantHouseholdMapper.deleteHhcByNo(peasantHouseholdNo);
}else {
// 删除hygf_peasant_household表中数据
peasantHouseholdMapper.deleteHphByUserId(peasantHousehold.getAmosUserId());
// 删除privilege_agency_user表中数据
peasantHouseholdMapper.deletePauByUserId(peasantHousehold.getAmosUserId());
// 删除auth_login_info表中数据
peasantHouseholdMapper.deleteAliByUserId(peasantHousehold.getAmosUserId());
// 删除hygf_household_contract表中数据
peasantHouseholdMapper.deleteHhcByUserId(peasantHousehold.getAmosUserId());
}
return true;
} catch (Exception e) {
throw new BadRequest("删除失败！" + e.getMessage());
}
// } catch (Exception e) {
// throw new BadRequest("删除失败！" + e.getMessage());
// }
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment