Skip to content

A
amos-boot-biz
Commit 439cde15 authored by tangwei's avatar tangwei
Browse files
Options

修改地址截取错乱

parent 2b915543
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 15 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PersonnelBusinessMapper.xml
View file @ 439cde15
...@@ -68,7 +68,8 @@ select ORG_CODE orgCode from privilege_company where privilege_company.SEQUEN ...@@ -68,7 +68,8 @@ select ORG_CODE orgCode from privilege_company where privilege_company.SEQUEN
hygf_personnel_business.amos_dealer_id amosDealerId , hygf_personnel_business.amos_dealer_id amosDealerId ,
privilege_company.COMPANY_NAME amosDealerName , privilege_company.COMPANY_NAME amosDealerName ,
privilege_company.ORG_CODE amosDealerOrgCode, privilege_company.ORG_CODE amosDealerOrgCode,
hygf_unit_info.sequence_nbr amosUnitInfoId (select sequence_nbr from hygf_unit_info h where h.amos_company_seq= hygf_personnel_business.amos_dealer_id )amosUnitInfoId
FROM std_user_biz LEFT JOIN hygf_personnel_business FROM std_user_biz LEFT JOIN hygf_personnel_business
LEFT JOIN hygf_unit_info on hygf_personnel_business.amos_unit_id=hygf_unit_info.amos_company_seq LEFT JOIN hygf_unit_info on hygf_personnel_business.amos_unit_id=hygf_unit_info.amos_company_seq
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PowerStationMapper.xml
View file @ 439cde15
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<if test="serviceAgent!=null and serviceAgent!=''"> <if test="serviceAgent!=null and serviceAgent!=''">
and hygf_power_station.service_agent=#{serviceAgent} and hygf_power_station.service_agent=#{serviceAgent}
</if> </if>
ORDER BY hygf_power_station.rec_date desc
) a ) a
</select> </select>
</mapper> </mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PeasantHouseholdController.java
View file @ 439cde15
...@@ -87,11 +87,11 @@ public class PeasantHouseholdController extends BaseController { ...@@ -87,11 +87,11 @@ public class PeasantHouseholdController extends BaseController {
area = area + re.getRegionName() + "/"; area = area + re.getRegionName() + "/";
} }
} }
model.setProjectAddressName(area.substring(0, area.length() - 2)); model.setProjectAddressName(area.substring(0, area.length() - 1));
if ("1".equals(model.getIsPermanent())) { if ("1".equals(model.getIsPermanent())) {
model.setPermanentAddress(model.getProjectAddress()); model.setPermanentAddress(model.getProjectAddress());
model.setPermanentAddressDetail(model.getProjectAddressDetail()); model.setPermanentAddressDetail(model.getProjectAddressDetail());
model.setPermanentAddressName(area.substring(0, area.length() - 2)); model.setPermanentAddressName(area.substring(0, area.length() - 1));
}else { }else {
// 处理常住地址 // 处理常住地址
String permanent = ""; String permanent = "";
...@@ -102,7 +102,7 @@ public class PeasantHouseholdController extends BaseController { ...@@ -102,7 +102,7 @@ public class PeasantHouseholdController extends BaseController {
permanent = permanent + re.getRegionName() + "/"; permanent = permanent + re.getRegionName() + "/";
} }
} }
model.setPermanentAddressName(permanent.substring(0, permanent.length() - 2)); model.setPermanentAddressName(permanent.substring(0, permanent.length() - 1));
} }
} }
} }
...@@ -145,7 +145,7 @@ public class PeasantHouseholdController extends BaseController { ...@@ -145,7 +145,7 @@ public class PeasantHouseholdController extends BaseController {
projectAddressName = projectAddressName + re.getRegionName() + "/"; projectAddressName = projectAddressName + re.getRegionName() + "/";
} }
} }
model.setProjectAddressName(projectAddressName.substring(0, projectAddressName.length() - 2)); model.setProjectAddressName(projectAddressName.substring(0, projectAddressName.length() - 1));
} }
if ("1".equals(model.getIsPermanent())) { if ("1".equals(model.getIsPermanent())) {
model.setPermanentAddress(model.getProjectAddress()); model.setPermanentAddress(model.getProjectAddress());
...@@ -160,7 +160,7 @@ public class PeasantHouseholdController extends BaseController { ...@@ -160,7 +160,7 @@ public class PeasantHouseholdController extends BaseController {
permanentAddressName = permanentAddressName + re.getRegionName() + "/"; permanentAddressName = permanentAddressName + re.getRegionName() + "/";
} }
} }
model.setPermanentAddressName(permanentAddressName.substring(0, permanentAddressName.length() - 2)); model.setPermanentAddressName(permanentAddressName.substring(0, permanentAddressName.length() - 1));
} }
PeasantHouseholdDto peasantHouseholdDto = peasantHouseholdServiceImpl.queryBySeq(sequenceNbr); PeasantHouseholdDto peasantHouseholdDto = peasantHouseholdServiceImpl.queryBySeq(sequenceNbr);
BeanUtils.copyProperties(model,peasantHouseholdDto); BeanUtils.copyProperties(model,peasantHouseholdDto);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PeasantHouseholdWxController.java
View file @ 439cde15
...@@ -146,11 +146,11 @@ public class PeasantHouseholdWxController extends BaseController { ...@@ -146,11 +146,11 @@ public class PeasantHouseholdWxController extends BaseController {
area = area + re.getRegionName() + "/"; area = area + re.getRegionName() + "/";
} }
} }
model.setProjectAddressName(area.length() > 2 ? area.substring(0, area.length() - 2) : area); model.setProjectAddressName(area.length() > 2 ? area.substring(0, area.length() - 1) : area);
if ("1".equals(model.getIsPermanent()) || "true".equals(model.getIsPermanent())) { if ("1".equals(model.getIsPermanent()) || "true".equals(model.getIsPermanent())) {
model.setPermanentAddress(model.getProjectAddress()); model.setPermanentAddress(model.getProjectAddress());
model.setPermanentAddressDetail(model.getProjectAddressDetail()); model.setPermanentAddressDetail(model.getProjectAddressDetail());
model.setPermanentAddressName(area.length() > 2 ? area.substring(0, area.length() - 2) : area); model.setPermanentAddressName(area.length() > 2 ? area.substring(0, area.length() - 1) : area);
} else { } else {
// 处理常住地址 // 处理常住地址
String permanent = ""; String permanent = "";
...@@ -161,7 +161,7 @@ public class PeasantHouseholdWxController extends BaseController { ...@@ -161,7 +161,7 @@ public class PeasantHouseholdWxController extends BaseController {
permanent = permanent + re.getRegionName() + "/"; permanent = permanent + re.getRegionName() + "/";
} }
} }
model.setPermanentAddressName(permanent.length() > 2 ? permanent.substring(0, permanent.length() - 2) : permanent); model.setPermanentAddressName(permanent.length() > 2 ? permanent.substring(0, permanent.length() - 1) : permanent);
} }
} }
} }
...@@ -201,6 +201,7 @@ public class PeasantHouseholdWxController extends BaseController { ...@@ -201,6 +201,7 @@ public class PeasantHouseholdWxController extends BaseController {
return jsonArray; return jsonArray;
} }
@TycloudOperation (ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation (ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping("/getRegionQrCode") @GetMapping("/getRegionQrCode")
@ApiOperation (httpMethod = "GET", value = " 获取区域经销商二维码", notes = " 获取区域经销商二维码") @ApiOperation (httpMethod = "GET", value = " 获取区域经销商二维码", notes = " 获取区域经销商二维码")
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java
View file @ 439cde15
...@@ -229,7 +229,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS ...@@ -229,7 +229,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
boolean flag = true; boolean flag = true;
if (PowerStationNodeEnum.设计上传图纸.getCode().equals(nodeCode)||PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) { if (PowerStationNodeEnum.设计上传图纸.getCode().equals(nodeCode)||PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) {
powerStation.setProcessStatus(PowerStationProcessStateEnum.通过.getName()); powerStation.setProcessStatus(PowerStationProcessStateEnum.进行中.getName());
this.updateSeve(nodeCode,powerStation.getPeasantHouseholdId(),kv); this.updateSeve(nodeCode,powerStation.getPeasantHouseholdId(),kv);
} else { } else {
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java
View file @ 439cde15
...@@ -202,7 +202,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -202,7 +202,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
LambdaUpdateWrapper<PreparationMoneyLog> q1=new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<PreparationMoneyLog> q1=new LambdaUpdateWrapper<>();
q1.eq(PreparationMoneyLog::getPreparationMoneyId,sequenceNbr); q1.eq(PreparationMoneyLog::getPreparationMoneyId,sequenceNbr);
q1.orderByDesc(PreparationMoneyLog::getExecutionTime); q1.orderByAsc(PreparationMoneyLog::getExecutionTime);
List<PreparationMoneyLog> liD=preparationMoneyLogMapper.selectList(q1); List<PreparationMoneyLog> liD=preparationMoneyLogMapper.selectList(q1);
preparationMoney.setPreparationMoneyLog(liD); preparationMoney.setPreparationMoneyLog(liD);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java
View file @ 439cde15
...@@ -151,7 +151,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD ...@@ -151,7 +151,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
} }
} }
} }
commercial.setProjectAddressName(paddressName.substring(0, paddressName.length() - 2)); commercial.setProjectAddressName(paddressName.substring(0, paddressName.length() - 1));
commercial.setSurveyInformationId(surveyInformation.getSequenceNbr()); commercial.setSurveyInformationId(surveyInformation.getSequenceNbr());
commercialService.saveOrUpdate(commercial); commercialService.saveOrUpdate(commercial);
//勘察后，更新状态 //勘察后，更新状态
...@@ -186,7 +186,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD ...@@ -186,7 +186,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
} }
} }
} }
peasantHousehold.setProjectAddressName(projectAddressName.substring(0, projectAddressName.length() - 2)); peasantHousehold.setProjectAddressName(projectAddressName.substring(0, projectAddressName.length() - 1));
//常住地址 //常住地址
String permanentAddressName = ""; String permanentAddressName = "";
for (Integer reg : surveyInfoAllDto.getSurveyInformation().getPermanentAddress()) { for (Integer reg : surveyInfoAllDto.getSurveyInformation().getPermanentAddress()) {
...@@ -196,7 +196,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD ...@@ -196,7 +196,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
} }
} }
} }
peasantHousehold.setPermanentAddressName(permanentAddressName.substring(0, permanentAddressName.length() - 2)); peasantHousehold.setPermanentAddressName(permanentAddressName.substring(0, permanentAddressName.length() - 1));
if(OPERATION_TYPE_SUBMIT.equals(operationType)){ if(OPERATION_TYPE_SUBMIT.equals(operationType)){
peasantHousehold.setSurveyOrNot(1); peasantHousehold.setSurveyOrNot(1);
......
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