Skip to content

A
amos-boot-zx-biz
Commit 8dabf4d9 authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

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

parents fcb8f92d 42c7ab45
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 18 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/RectificationOrderEnum.java
View file @ 8dabf4d9
......@@ -10,7 +10,7 @@ public enum RectificationOrderEnum {
施工("ProcessEngineering", "area,design,engineering"),
并网("GridConnected", "bw-area,bw-design,bw-engineering"),
验收("AcceptanceCheck", "ys-area,ys-tourong,ys-fawu");
验收("AcceptanceCheck", "ys-area,ys-tourong,ys-fawu,ys-zichan");
/**
* 名称，描述
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceCheckMapper.xml
View file @ 8dabf4d9
......@@ -28,9 +28,9 @@
WHEN hbga.acceptance_check_status = '2' THEN '经销商管理员待审核'
WHEN hbga.acceptance_check_status = '3' THEN '已完成'
WHEN hbga.acceptance_check_status = '4' THEN '未通过'
WHEN hbga.acceptance_check_status = '11' THEN '投融待审核/法务待审核'
WHEN hbga.acceptance_check_status = '9' THEN '整改待审核'
WHEN hbga.acceptance_check_status = '7' THEN '片区运营待审核'
WHEN hbga.acceptance_check_status = '9' THEN '整改待审核'
WHEN hbga.acceptance_check_status = '11' THEN '投融待审核/法务待审核'
WHEN hbga.acceptance_check_status = '12' THEN '投融待审核'
WHEN hbga.acceptance_check_status = '13' THEN '资产待审核'
WHEN hbga.acceptance_check_status = '14' THEN '法务待审核'
......@@ -49,6 +49,9 @@
<if test="map.regionCompanyId!=null and map.regionCompanyId!=''">
and hygf_work_order.region_company_id =#{map.regionCompanyId}
</if>
<if test="map.powerStationCode!=null and map.powerStationCode!=''">
and hph.peasant_household_no like concat('%',#{map.powerStationCode},'%'}
</if>
<if test="map.formType != null and map.formType!=''">
AND hbga.grid_status IN ('2', '3', '4')
</if>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml
View file @ 8dabf4d9
......@@ -57,6 +57,9 @@
<if test="map.regionCompanyId!=null and map.regionCompanyId!=''">
and hygf_work_order.region_company_id =#{map.regionCompanyId}
</if>
<if test="map.powerStationCode!=null and map.powerStationCode!=''">
and hph.peasant_household_no like concat('%',#{map.powerStationCode},'%'}
</if>
<if test="map.formType != null and map.formType!=''">
AND hbga.grid_status IN ('2', '3', '4')
</if>
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HouseholdContractController.java
View file @ 8dabf4d9
......@@ -297,7 +297,7 @@ public class HouseholdContractController extends BaseController {
}
}catch (Exception e){
e.printStackTrace();
throw new BadRequest("系统异常");
throw new BadRequest(e.getMessage());
}
return householdContractServiceImpl.updateById(householdContrac);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceCheckServiceImpl.java
View file @ 8dabf4d9
......@@ -375,7 +375,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
query.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待提交","待审核"));
query.in(HygfRectificationOrder::getRectificationSource,Arrays.asList("bw-design","bw-engineering"));
query.in(HygfRectificationOrder::getRectificationSource,Arrays.asList("ys-tourong","ys-fawu"));
List<HygfRectificationOrder> hygfRectificationOrders = rectificationOrderService.getBaseMapper().selectList(query);
for (HygfRectificationOrder hygfRectificationOrderO : hygfRectificationOrders) {
if (hygfRectificationOrderO.getRectificationStatus().equals("待审核")){
......@@ -470,7 +470,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
}
}else {
List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,collect.contains(WorkOrderEnum.整改待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,collect.contains(WorkOrderEnum.待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
}
this.update(null,qu);
}else {
......@@ -486,7 +486,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
qu.eq(AcceptanceCheck::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
if (CollectionUtil.isEmpty(list)) {
List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,collect.contains(WorkOrderEnum.整改待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,collect.contains(WorkOrderEnum.待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
}else {
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
}
......@@ -545,7 +545,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
}
}else {
List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,collect.contains(WorkOrderEnum.整改待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,collect.contains(WorkOrderEnum.待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
}
}else {
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java
View file @ 8dabf4d9
......@@ -540,10 +540,10 @@ public class BasicGridAcceptanceServiceImpl
acceptanceCheck.setAcceptanceCheckStatus(GridStatusEnum.DTJYS.getCode());
acceptanceCheckService.saveOrUpdate(acceptanceCheck);
}else if( null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0") && ( Objects.isNull(basicGridRecord.getRectificationStatus())||(!basicGridRecord.getRectificationStatus().contains("bw-bw-engineering")) ) ) {
}else if( null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0") && ( Objects.isNull(basicGridRecord.getRectificationStatus())||(!basicGridRecord.getRectificationStatus().contains("bw-engineering")) ) ) {
up.set(BasicGridRecord::getBasicGridNode,"bw-engineering");
up.set(BasicGridRecord::getGridStatus,GridStatusEnum.GCDSH.getCode());
}else if( null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0") && basicGridRecord.getRectificationStatus() .contains("bw-engineering") ) {
}else if( null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0") && basicGridRecord.getRectificationStatus().contains("bw-engineering") ) {
up.set(BasicGridRecord::getBasicGridNode,"bw-engineering");
LambdaQueryWrapper<HygfRectificationOrder> query2 = new LambdaQueryWrapper<>();
query2.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
......@@ -586,10 +586,10 @@ public class BasicGridAcceptanceServiceImpl
acceptanceCheck.setAcceptanceCheckStatus(GridStatusEnum.DTJYS.getCode());
acceptanceCheckService.saveOrUpdate(acceptanceCheck);
}else if( null == basicGridRecord.getPowerStationDesignStatus() && approvalStatus.equals("0") && ( Objects.isNull(basicGridRecord.getRectificationStatus())||(!basicGridRecord.getRectificationStatus().contains("bw-bw-design")) )) {
}else if( null == basicGridRecord.getPowerStationDesignStatus() && approvalStatus.equals("0") && ( Objects.isNull(basicGridRecord.getRectificationStatus())||(!basicGridRecord.getRectificationStatus().contains("bw-design")) )) {
up.set(BasicGridRecord::getBasicGridNode,"bw-design");
up.set(BasicGridRecord::getGridStatus,GridStatusEnum.SJDSH.getCode());
}else if( null == basicGridRecord.getPowerStationDesignStatus() &&approvalStatus.equals("0") && !Objects.isNull(basicGridRecord.getRectificationStatus()) && basicGridRecord.getRectificationStatus().contains("bw-bw-design") ) {
}else if( null == basicGridRecord.getPowerStationDesignStatus() &&approvalStatus.equals("0") && !Objects.isNull(basicGridRecord.getRectificationStatus()) && basicGridRecord.getRectificationStatus().contains("bw-design") ) {
up.set(BasicGridRecord::getBasicGridNode,"bw-design");
LambdaQueryWrapper<HygfRectificationOrder> query1 = new LambdaQueryWrapper<>();
query1.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
......@@ -760,7 +760,7 @@ public class BasicGridAcceptanceServiceImpl
}
}else {
List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
qu.set(BasicGridRecord::getGridStatus,collect.contains(WorkOrderEnum.整改待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
qu.set(BasicGridRecord::getGridStatus,collect.contains(WorkOrderEnum.待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
}
basicGridRecordService.update(null,qu);
}
......@@ -770,7 +770,7 @@ public class BasicGridAcceptanceServiceImpl
qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
if (CollectionUtil.isEmpty(list)) {
List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
qu.set(BasicGridRecord::getGridStatus,collect.contains(WorkOrderEnum.整改待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
qu.set(BasicGridRecord::getGridStatus,collect.contains(WorkOrderEnum.待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
}else {
qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
}
......@@ -830,7 +830,7 @@ public class BasicGridAcceptanceServiceImpl
}
}else {
List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
qu.set(BasicGridRecord::getGridStatus,collect.contains(WorkOrderEnum.整改待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
qu.set(BasicGridRecord::getGridStatus,collect.contains(WorkOrderEnum.待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
}
}
......
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/application-dev1.properties
View file @ 8dabf4d9
......@@ -65,14 +65,14 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://10.20.1.210:2883
emqx.user-name=admin
emqx.password=public
emqx.password=Yeejoin@2020
mqtt.scene.host=mqtt://10.20.1.210:8083/mqtt
mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt
spring.mqtt.completionTimeout=3000
emqx.max-inflight=1000
emqx.client-user-name=admin
emqx.client-password=public
emqx.client-password=Yeejoin@2020
## influxDB
#spring.influx.url= http://172.16.3.155:18186
......
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/application-kingbase8.properties
View file @ 8dabf4d9
......@@ -70,7 +70,7 @@ emqx.client-user-name=
emqx.client-password=
emqx.broker=tcp://10.20.1.210:2883
emqx.user-name=admin
emqx.password=public
emqx.password=Yeejoin@2020
mqtt.scene.host=mqtt://10.20.1.210:8083/mqtt
mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt
......
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