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

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

@@ -10,8 +10,8 @@ hygf_household_contract.`status`='双方已签署'
 and hygf_peasant_household.developer_id=#{developerId}
 and hygf_peasant_household.regional_companies_seq=#{regionalCompaniesSeq}
 and hygf_peasant_household.survey_or_not=3 and  hygf_peasant_household.sequence_nbr not in
-(select hygf_document_station.station_id  from hygf_preparation_money LEFT JOIN hygf_document_station
-on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nbr  where hygf_preparation_money.delivery_state !='已作废'
+(select hygf_document_station.station_id  from hygf_preparation_money RIGHT JOIN hygf_document_station
+on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nbr  where hygf_preparation_money.order_status ='待发货'
     <if test="ids!=null and ids !=''">
         and hygf_document_station.preparation_money_id !=#{ids}
     </if>

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

@@ -73,7 +73,7 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
             and hygf_peasant_household.owners_name like concat ('%',#{ownersName},'%')
         </if>
         <if test=" preparationMoneyState == 1 ">
-            and hygf_peasant_household.preparation_money_state not in  ('待发货','待补货','暂存发货') and preparation_money_state is not and preparation_money_state != ''
+            and hygf_peasant_household.preparation_money_state not in  ('待发货','待补货','暂存发货') and preparation_money_state is not null and preparation_money_state != ''
         </if>
 
 

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

@@ -15,6 +15,7 @@ import com.qiyuesuo.sdk.v2.response.MiniappTicketResult;
 import com.qiyuesuo.sdk.v2.response.SdkResponse;
 import com.qiyuesuo.sdk.v2.utils.Algorithm;
 import com.qiyuesuo.sdk.v2.utils.Base64Utils;
+import com.qiyuesuo.sdk.v2.utils.CollectionUtils;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
@@ -109,8 +110,10 @@ public class QiyuesuoController extends BaseController {
 			@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 		QueryWrapper<SealDictionary> queryWrapper = new QueryWrapper();
 		queryWrapper.eq("amos_company_seq", sequenceNbr);
-		SealDictionary sealDictionary = sealDictionaryMapper.selectOne(queryWrapper);
-		request.setUser(new User(sealDictionary.getSealedPhone(), "MOBILE"));
+		List<SealDictionary> sealDictionaryList = sealDictionaryMapper.selectList(queryWrapper);
+		if(CollectionUtils.isNotEmpty(sealDictionaryList)){
+			request.setUser(new User(sealDictionaryList.get(0).getSealedPhone(), "MOBILE"));
+		}
 		SdkResponse<MiniappTicketResult> result = qiyuesuoService.getContractSdkResponse(request);
 		return ResponseHelper.buildResponse(result.getResult());
 	}

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

@@ -54,11 +54,12 @@ public class WorkOrderController extends BaseController {
      * 新增施工派工工单
      *
      * @return
+     * @throws Exception 
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增施工派工工单", notes = "新增施工派工工单")
-	public ResponseModel<WorkOrder> save(@RequestBody WorkOrder model) {
+	public ResponseModel<WorkOrder> save(@RequestBody WorkOrder model) throws Exception {
         UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
 	    model = workOrderServiceImpl.saveWorkOrder(model,userUnitInformationDto);
 	    return ResponseHelper.buildResponse(model);

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
@@ -14,7 +15,6 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.api.service.IHouseholdContractService;
 import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,7 +33,7 @@ import java.util.List;
  * @date 2023-08-21
  */
 @Service
-public class HouseholdContractServiceImpl extends BaseService<HouseholdContractDto,HouseholdContract,HouseholdContractMapper> implements IHouseholdContractService {
+public class HouseholdContractServiceImpl extends BaseService<HouseholdContractDto, HouseholdContract, HouseholdContractMapper> implements IHouseholdContractService {
 
 
     @Autowired
@@ -57,11 +57,12 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
 
     @Autowired
     RegionalCompaniesMapper regionalCompaniesMapper;
+
     /**
      * 列表查询 示例
      */
     public List<HouseholdContractDto> queryForHouseholdContractList() {
-        return this.queryForList("" , false);
+        return this.queryForList("", false);
     }
 
 
@@ -96,7 +97,7 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
 
     //农户注册成功后生成合同
 
-    public void addHouseholdContract(HouseholdContract householdContract){
+    public void addHouseholdContract(HouseholdContract householdContract) {
 
         householdContract.setContractNumber(this.getnum(householdContract.getRegionalCompaniesSeq()));//合同编号
         householdContract.setSurveyStatus(HouseholdContractEnum.勘察状态_未勘察.getCode());
@@ -106,7 +107,8 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         householdContract.setInitiateStatus(HouseholdContractEnum.发起状态_未发起.getCode());
         householdContractMapper.insert(householdContract);
     }
-    public void reissueHouseholdContract(HouseholdContract householdContract){
+
+    public void reissueHouseholdContract(HouseholdContract householdContract) {
 
         householdContract.setContractNumber(this.getnum(householdContract.getRegionalCompaniesSeq()));//合同编号
         householdContract.setStatus(HouseholdContractEnum.合同状态_未签署.getCode());
@@ -117,21 +119,21 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
     }
 
     public String getnum(Long sequenceNbr) {
-        RegionalCompanies da= regionalCompaniesMapper.selectRegionName(sequenceNbr);
-        if(da.getCompanyCode()==null||da.getCompanyCode().isEmpty()){
+        RegionalCompanies da = regionalCompaniesMapper.selectRegionName(sequenceNbr);
+        if (da.getCompanyCode() == null || da.getCompanyCode().isEmpty()) {
             throw new BadRequest("区域公司编号为空, 请设置编号");
         }
-        if(da.getRegionalAddress()==null||da.getRegionalAddress().isEmpty()){
+        if (da.getRegionalAddress() == null || da.getRegionalAddress().isEmpty()) {
             throw new BadRequest("区域公司省市区为空, 请设置省市区");
         }
-        String code=  NumberUtil.getCode(CodeEnum.勘察.getCode(),da.getCompanyCode(),da.getRegionalAddress());
+        String code = NumberUtil.getCode(CodeEnum.勘察.getCode(), da.getCompanyCode(), da.getRegionalAddress());
         return code;
     }
 
 
     @Transactional
-    public HouseholdContract initiateHouseholdContract(HouseholdContractDto model){
-        HouseholdContract householdContract=  householdContractMapper.selectById(model.getSequenceNbr());
+    public HouseholdContract initiateHouseholdContract(HouseholdContractDto model) {
+        HouseholdContract householdContract = householdContractMapper.selectById(model.getSequenceNbr());
         householdContract.setPartyA(model.getPartyA());
         householdContract.setPartyB(model.getPartyB());
         householdContract.setContractTemplateId(model.getContractTemplateId());
@@ -145,28 +147,30 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         householdContract.setStationPower(model.getStationPower());
         householdContract.setName(model.getName());
         //调用第三方
-        ContractDataDto contractDataDto =new ContractDataDto();
+        ContractDataDto contractDataDto = new ContractDataDto();
         contractDataDto.setUsername(model.getPartyA());
         contractDataDto.setContact(model.getPeasantHouseholdPhone());
         contractDataDto.setIDCard(model.getPeasantHouseholdCard());
         contractDataDto.setSubject(model.getName());
 
-        QueryWrapper<SealDictionary> queryWrapper=new QueryWrapper();
-        queryWrapper.eq("amos_company_seq",householdContract.getRegionalCompaniesSeq());
-        SealDictionary sealDictionary=sealDictionaryMapper.selectOne(queryWrapper);
+        QueryWrapper<SealDictionary> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("amos_company_seq", householdContract.getRegionalCompaniesSeq());
+        List<SealDictionary> sealDictionaryList = sealDictionaryMapper.selectList(queryWrapper);
+        List<Long> listSealId = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(sealDictionaryList)) {
+            for (SealDictionary sealDictionary : sealDictionaryList) {
                 contractDataDto.setCategory(sealDictionary.getCategory());
                 contractDataDto.setCompanyTenantName(sealDictionary.getCompanyTenantName());
                 contractDataDto.setCompanyUsername(sealDictionary.getSealedUser());
                 contractDataDto.setCompanyContact(sealDictionary.getSealedPhone());
-        List<Long> listSealId= new ArrayList<>();
                 listSealId.add(sealDictionary.getSealId());
+            }
+        }
         contractDataDto.setSealId(listSealId);
 
-
-
-        QueryWrapper<ContractTemplate> qu=new QueryWrapper();
-        qu.eq("template_id",model.getContractTemplateId());
-        ContractTemplate contractTemplate=contractTemplateMapper.selectOne(qu);
+        QueryWrapper<ContractTemplate> qu = new QueryWrapper();
+        qu.eq("template_id", model.getContractTemplateId());
+        ContractTemplate contractTemplate = contractTemplateMapper.selectOne(qu);
         contractDataDto.setEmplateId(model.getContractTemplateId());
         contractDataDto.setCompanykeyword(contractTemplate.getCompanyKeyword());
         contractDataDto.setCompanyPage(contractTemplate.getCompanyPage());
@@ -178,18 +182,18 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         contractDataDto.setPersonalOffsetX(contractTemplate.getPersonalOffsetx());
         contractDataDto.setPersonalOffsetY(contractTemplate.getPersonalOffsety());
         contractDataDto.setPersonalKeywordIndex(contractTemplate.getPersonalKeywordIndex());
-        SimpleDateFormat myFmt2=new SimpleDateFormat("yyyy-MM-dd");
-        Date now=new Date();
-        String daty= myFmt2.format(now);
-        List<TemplateParamDto> templateParam=new ArrayList<>();
+        SimpleDateFormat myFmt2 = new SimpleDateFormat("yyyy-MM-dd");
+        Date now = new Date();
+        String daty = myFmt2.format(now);
+        List<TemplateParamDto> templateParam = new ArrayList<>();
         //公共字段填充
         SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd");
-        templateParam.add(new TemplateParamDto("partyA",householdContract.getPartyA()!=null?householdContract.getPartyA():null));
-        templateParam.add(new TemplateParamDto("peasantHouseholdPhone",householdContract.getPeasantHouseholdPhone()!=null?householdContract.getPeasantHouseholdPhone():null));
-        templateParam.add(new TemplateParamDto("peasantHouseholdCard",householdContract.getPeasantHouseholdCard()!=null?householdContract.getPeasantHouseholdCard():null));
-        templateParam.add(new TemplateParamDto("permanentAddressDetail",householdContract.getPermanentAddressName()!=null?householdContract.getPermanentAddressName()+householdContract.getPermanentAddressDetail():null));
-        templateParam.add(new TemplateParamDto("projectAddressDetail",householdContract.getProjectAddressName()!=null?householdContract.getProjectAddressName()+householdContract.getProjectAddressDetail():null));
-        templateParam.add(new TemplateParamDto("signingTime",daty));
+        templateParam.add(new TemplateParamDto("partyA", householdContract.getPartyA() != null ? householdContract.getPartyA() : null));
+        templateParam.add(new TemplateParamDto("peasantHouseholdPhone", householdContract.getPeasantHouseholdPhone() != null ? householdContract.getPeasantHouseholdPhone() : null));
+        templateParam.add(new TemplateParamDto("peasantHouseholdCard", householdContract.getPeasantHouseholdCard() != null ? householdContract.getPeasantHouseholdCard() : null));
+        templateParam.add(new TemplateParamDto("permanentAddressDetail", householdContract.getPermanentAddressName() != null ? householdContract.getPermanentAddressName() + householdContract.getPermanentAddressDetail() : null));
+        templateParam.add(new TemplateParamDto("projectAddressDetail", householdContract.getProjectAddressName() != null ? householdContract.getProjectAddressName() + householdContract.getProjectAddressDetail() : null));
+        templateParam.add(new TemplateParamDto("signingTime", daty));
 
         //合同动态填充字段
 //        templateParam.add(new TemplateParamDto("rentFree",householdContract.getRentFree()!=null?sdfdate.format(householdContract.getRentFree()):null));
@@ -201,10 +205,10 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
 //        templateParam.add(new TemplateParamDto("componentPower",householdContract.getComponentPower()!=null?String.valueOf(householdContract.getComponentPower()):null));
 //        templateParam.add(new TemplateParamDto("stationPower",householdContract.getStationPower()!=null?String.valueOf(householdContract.getStationPower()):null));
 
-        List<ContractFillData> contractFillData= model.getContractFillData();
-        if(contractFillData!=null&&!contractFillData.isEmpty()){
+        List<ContractFillData> contractFillData = model.getContractFillData();
+        if (contractFillData != null && !contractFillData.isEmpty()) {
             for (ContractFillData contractFillDatum : contractFillData) {
-                templateParam.add(new TemplateParamDto(contractFillDatum.getField(),contractFillDatum.getValue()));
+                templateParam.add(new TemplateParamDto(contractFillDatum.getField(), contractFillDatum.getValue()));
                 //保存动态值
                 contractFillDatum.setSequenceNbr(null);
                 contractFillDatum.setContractId(householdContract.getSequenceNbr());
@@ -212,22 +216,22 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
             }
         }
 
-        Long  contractLockId=qiyuesuoServiceImpl.addContract(contractDataDto , templateParam);
+        Long contractLockId = qiyuesuoServiceImpl.addContract(contractDataDto, templateParam);
         householdContract.setContractLockId(contractLockId);
         householdContract.setInitiateStatus(HouseholdContractEnum.发起状态_已发起.getCode());
         householdContractMapper.updateById(householdContract);
         //创建农户待办
 
-        ToDoTasks toDoTasks1=  new ToDoTasks (  TaskTypeStationEnum.合同填报.getCode(),  householdContract.getSequenceNbr(),   "用户"+householdContract.getPartyA()+"的合同填写",householdContract.getDealerCode());
-        PeasantHousehold peasantHousehold=peasantHouseholdServiceImpl.getById(householdContract.getPeasantHouseholdId());
-        toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getAmosUserId(),toDoTasks1,"任务明细：合同发起成功");
+        ToDoTasks toDoTasks1 = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(), householdContract.getSequenceNbr(), "用户" + householdContract.getPartyA() + "的合同填写", householdContract.getDealerCode());
+        PeasantHousehold peasantHousehold = peasantHouseholdServiceImpl.getById(householdContract.getPeasantHouseholdId());
+        toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getAmosUserId(), toDoTasks1, "任务明细：合同发起成功");
         return householdContract;
 
     }
 
 
     @Transactional
-    public HouseholdContract reissueinitiateHouseholdContract(HouseholdContract model){
+    public HouseholdContract reissueinitiateHouseholdContract(HouseholdContract model) {
         // 查询已存在的合同，如果存在有效(非作废)的合同，则无法重新发起
         Long peasantHouseholdId = model.getPeasantHouseholdId();
         Integer count = householdContractMapper.selectCount(
@@ -240,9 +244,9 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
             throw new BadRequest("已存在有效的合同，无法重新发起");
         }
 
-         HouseholdContract peasantHousehold=  this.getById(model.getSequenceNbr());
+        HouseholdContract peasantHousehold = this.getById(model.getSequenceNbr());
         //生成合同
-        HouseholdContract householdContract=new HouseholdContract();
+        HouseholdContract householdContract = new HouseholdContract();
         householdContract.setPartyA(model.getPartyA());
         householdContract.setPartyB(model.getPartyB());
         householdContract.setContractTemplateId(model.getContractTemplateId());
@@ -276,29 +280,31 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         this.reissueHouseholdContract(householdContract);
 
 
-
-
-        ContractDataDto contractDataDto =new ContractDataDto();
+        ContractDataDto contractDataDto = new ContractDataDto();
         contractDataDto.setUsername(householdContract.getPartyA());
         contractDataDto.setContact(householdContract.getPeasantHouseholdPhone());
         contractDataDto.setIDCard(householdContract.getPeasantHouseholdCard());
         contractDataDto.setSubject(householdContract.getName());
 
 
-        QueryWrapper<SealDictionary> queryWrapper=new QueryWrapper();
-        queryWrapper.eq("amos_company_seq",householdContract.getRegionalCompaniesSeq());
-        SealDictionary sealDictionary=sealDictionaryMapper.selectOne(queryWrapper);
+        QueryWrapper<SealDictionary> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("amos_company_seq", householdContract.getRegionalCompaniesSeq());
+        List<SealDictionary> sealDictionaryList = sealDictionaryMapper.selectList(queryWrapper);
+        List<Long> listSealId = new ArrayList<>();
+        if(CollectionUtils.isNotEmpty(sealDictionaryList)){
+            for (SealDictionary sealDictionary : sealDictionaryList) {
                 contractDataDto.setCategory(sealDictionary.getCategory());
                 contractDataDto.setCompanyTenantName(sealDictionary.getCompanyTenantName());
                 contractDataDto.setCompanyUsername(sealDictionary.getSealedUser());
                 contractDataDto.setCompanyContact(sealDictionary.getSealedPhone());
-        List<Long> listSealId= new ArrayList<>();
                 listSealId.add(sealDictionary.getSealId());
+            }
+        }
         contractDataDto.setSealId(listSealId);
 
-        QueryWrapper<ContractTemplate> qu=new QueryWrapper();
-        qu.eq("template_id",householdContract.getContractTemplateId());
-        ContractTemplate contractTemplate=contractTemplateMapper.selectOne(qu);
+        QueryWrapper<ContractTemplate> qu = new QueryWrapper();
+        qu.eq("template_id", householdContract.getContractTemplateId());
+        ContractTemplate contractTemplate = contractTemplateMapper.selectOne(qu);
         contractDataDto.setEmplateId(householdContract.getContractTemplateId());
         contractDataDto.setCompanykeyword(contractTemplate.getCompanyKeyword());
         contractDataDto.setCompanyPage(contractTemplate.getCompanyPage());
@@ -311,18 +317,18 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         contractDataDto.setPersonalOffsetY(contractTemplate.getPersonalOffsety());
         contractDataDto.setPersonalKeywordIndex(contractTemplate.getPersonalKeywordIndex());
 
-         SimpleDateFormat myFmt2=new SimpleDateFormat("yyyy-MM-dd");
-         Date now=new Date();
-         String daty= myFmt2.format(now);
+        SimpleDateFormat myFmt2 = new SimpleDateFormat("yyyy-MM-dd");
+        Date now = new Date();
+        String daty = myFmt2.format(now);
 
-        List<TemplateParamDto> templateParam=new ArrayList<>();
+        List<TemplateParamDto> templateParam = new ArrayList<>();
         SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd");
-        templateParam.add(new TemplateParamDto("partyA",householdContract.getPartyA()!=null?householdContract.getPartyA():null));
-        templateParam.add(new TemplateParamDto("peasantHouseholdPhone",householdContract.getPeasantHouseholdPhone()!=null?householdContract.getPeasantHouseholdPhone():null));
-        templateParam.add(new TemplateParamDto("peasantHouseholdCard",householdContract.getPeasantHouseholdCard()!=null?householdContract.getPeasantHouseholdCard():null));
-        templateParam.add(new TemplateParamDto("permanentAddressDetail",householdContract.getPermanentAddressName()!=null?householdContract.getPermanentAddressName()+householdContract.getPermanentAddressDetail():null));
-        templateParam.add(new TemplateParamDto("projectAddressDetail",householdContract.getProjectAddressName()!=null?householdContract.getProjectAddressName()+householdContract.getProjectAddressDetail():null));
-        templateParam.add(new TemplateParamDto("signingTime",daty));
+        templateParam.add(new TemplateParamDto("partyA", householdContract.getPartyA() != null ? householdContract.getPartyA() : null));
+        templateParam.add(new TemplateParamDto("peasantHouseholdPhone", householdContract.getPeasantHouseholdPhone() != null ? householdContract.getPeasantHouseholdPhone() : null));
+        templateParam.add(new TemplateParamDto("peasantHouseholdCard", householdContract.getPeasantHouseholdCard() != null ? householdContract.getPeasantHouseholdCard() : null));
+        templateParam.add(new TemplateParamDto("permanentAddressDetail", householdContract.getPermanentAddressName() != null ? householdContract.getPermanentAddressName() + householdContract.getPermanentAddressDetail() : null));
+        templateParam.add(new TemplateParamDto("projectAddressDetail", householdContract.getProjectAddressName() != null ? householdContract.getProjectAddressName() + householdContract.getProjectAddressDetail() : null));
+        templateParam.add(new TemplateParamDto("signingTime", daty));
 
 
         //合同动态填充字段
@@ -335,10 +341,10 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
 //        templateParam.add(new TemplateParamDto("componentPower",householdContract.getComponentPower()!=null?String.valueOf(householdContract.getComponentPower()):null));
 //        templateParam.add(new TemplateParamDto("stationPower",householdContract.getStationPower()!=null?String.valueOf(householdContract.getStationPower()):null));
 
-         List<ContractFillData> contractFillData= model.getContractFillData();
-         if(contractFillData!=null&&!contractFillData.isEmpty()){
+        List<ContractFillData> contractFillData = model.getContractFillData();
+        if (contractFillData != null && !contractFillData.isEmpty()) {
             for (ContractFillData contractFillDatum : contractFillData) {
-                 templateParam.add(new TemplateParamDto(contractFillDatum.getField(),contractFillDatum.getValue()));
+                templateParam.add(new TemplateParamDto(contractFillDatum.getField(), contractFillDatum.getValue()));
                 //保存动态值
                 contractFillDatum.setSequenceNbr(null);
                 contractFillDatum.setContractId(householdContract.getSequenceNbr());
@@ -347,16 +353,15 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         }
 
 
-        Long  contractLockId=qiyuesuoServiceImpl.addContract(contractDataDto , templateParam);
+        Long contractLockId = qiyuesuoServiceImpl.addContract(contractDataDto, templateParam);
         householdContract.setContractLockId(contractLockId);
         householdContract.setInitiateStatus(HouseholdContractEnum.发起状态_已发起.getCode());
         householdContractMapper.updateById(householdContract);
 
         //生成填报任务
-         ToDoTasks toDoTasks1=  new ToDoTasks (  TaskTypeStationEnum.合同填报.getCode(),  householdContract.getSequenceNbr(),   "用户"+householdContract.getPartyA()+"的合同填写",householdContract.getDealerCode());
-         PeasantHousehold peasan=peasantHouseholdServiceImpl.getById(householdContract.getPeasantHouseholdId());
-         toDoTasksServiceImpl.addToDoTasksByUserId(peasan.getAmosUserId(),toDoTasks1,"任务明细：合同发起成功");
-
+        ToDoTasks toDoTasks1 = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(), householdContract.getSequenceNbr(), "用户" + householdContract.getPartyA() + "的合同填写", householdContract.getDealerCode());
+        PeasantHousehold peasan = peasantHouseholdServiceImpl.getById(householdContract.getPeasantHouseholdId());
+        toDoTasksServiceImpl.addToDoTasksByUserId(peasan.getAmosUserId(), toDoTasks1, "任务明细：合同发起成功");
 
 
         return householdContract;

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

@@ -598,6 +598,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 hygfPreparationMoneyAuditingService.createWithModel(hygfPreparationMoneyAuditingDto);
                 //提交时 赋值发货时间及订单状态
                 model.setDeliveryTime(new Date());
+                model.setDeliveryState(DeliveryStateeEnum.已发货.getName());
+                model.setArrivalState(ArrivalStateeEnum.待收货.getName());
                 model.setOrderStatus(DeliveryStateeEnum.待确认.getName());
             } else {
                 up.set(PeasantHousehold::getConstructionState, DeliveryStateeEnum.暂存发货.getCode());
@@ -611,6 +613,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 List<DocumentStation> listDocumentStation = new ArrayList<>();
                 for (DocumentStation documentStation : ids) {
                     documentStation.setPreparationMoneyId(model.getSequenceNbr());
+                    documentStation.setSequenceNbr(null);
                     listDocumentStation.add(documentStation);
                 }
                 documentStationService.saveBatch(listDocumentStation);
@@ -696,6 +699,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 List<DocumentStation> listDocumentStation = new ArrayList<>();
                 for (DocumentStation documentStation : ids) {
                     documentStation.setPreparationMoneyId(model.getSequenceNbr());
+                    documentStation.setSequenceNbr(null);
                     listDocumentStation.add(documentStation);
                 }
                 documentStationService.saveBatch(listDocumentStation);
@@ -905,7 +909,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         preparationMoneyMapper.updateById(model);
 
         //执行工作流并保存记录
-        this.wofkflowExcute(instanceId, kv.getOrDefault("approvalStatus", "").toString(),kv.getOrDefault("comment","").toString());
+        this.wofkflowExcute(instanceId, kv.getOrDefault("approvalStatus", "").toString(),kv.getOrDefault("approvalStatus","").toString());
     }
 
 
@@ -1003,7 +1007,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         }else {
             preparationMoney.setOrderStatus(DeliveryStateeEnum.待确认.getName());
         }
-        this.wofkflowExcute(kv.get("instanceId").toString(), kv.get("approvalStatus").toString(),kv.getOrDefault("comment","").toString());
+        preparationMoneyMapper.updateById(preparationMoney);
+        this.wofkflowExcute(kv.get("instanceId").toString(), kv.get("approvalStatus").toString(),kv.getOrDefault("approveInfo","").toString());
     }
 
     public PreparationMoney  submitOrder(PreparationMoney model, String instanceId, String isSubmit){
@@ -1015,8 +1020,9 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
             model.setOrderStatus(DeliveryStateeEnum.待确认.getCode());
             preparationMoneyMapper.updateById(model);
             LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
-            up.set(PeasantHousehold::getPreparationMoneyState, ArrivalStateeEnum.待收货.getName());
-            up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.待收货.getName());
+            up.set(PeasantHousehold::getPreparationMoneyState, DeliveryStateeEnum.待补货.getName());
+            up.set(PeasantHousehold::getConstructionState, DeliveryStateeEnum.待补货.getName());
+            peasantHouseholdMapper.update(null,up);
             this.wofkflowExcute(instanceId,isSubmit,"");
         }
 

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

@@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 施工派工工单服务实现类
@@ -110,7 +111,24 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	}
 
 	@Transactional
-	public WorkOrder saveWorkOrder(WorkOrder model, UserUnitInformationDto userUnitInformationDto) {
+	public WorkOrder saveWorkOrder(WorkOrder model, UserUnitInformationDto userUnitInformationDto) throws Exception {
+		
+		// 校验电站已被选
+		List<PeasantHousehold> peasantHouseholdId = model.getPeasantHouseholdId();
+		List<PeasantHousehold> workorderPeasant = new ArrayList<>();
+		for (PeasantHousehold peasantHouse : peasantHouseholdId) {
+			int count = workOrderPowerStationServiceImpl.count(new LambdaQueryWrapper<WorkOrderPowerStation>()
+					.eq(WorkOrderPowerStation::getPeasantHouseholdId, peasantHouse.getSequenceNbr()));
+			if (count > 0) {
+				PeasantHousehold peasantHouseOne = peasantHouseholdMapper.selectById(peasantHouse.getSequenceNbr());
+				workorderPeasant.add(peasantHouseOne);
+			}
+		}
+		if (!workorderPeasant.isEmpty()) {
+			String names = workorderPeasant.stream().map(i -> i.getOwnersName()).collect(Collectors.joining(","));
+			throw new Exception("电站" + names + ",已被工单关联");
+		}
+
 		// 保存派工单
 		RegionalCompanies regionalCompanies = regionalCompaniesMapper.selectRegionName(model.getRegionCompanyId());
 		String code = NumberUtil.getCode(CodeEnum.派工单.getCode(), regionalCompanies.getCompanyCode(),
@@ -126,9 +144,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		model.setAmosDealerOrgCode(userUnitInformationDto.getAmosDealerOrgCode());
 
 		workOrderMapper.insert(model);
-		// 保存派工单 电站信息
-		List<PeasantHousehold> peasantHouseholdId = model.getPeasantHouseholdId();
 
+		// 保存派工单 电站信息
 		List<ConstructionRecords> constructionRecordlist = new ArrayList<>();
 		List<WorkOrderPowerStation> li = new ArrayList<>();
 		for (PeasantHousehold peasantHousehold : peasantHouseholdId) {
@@ -254,8 +271,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 
 	@Transactional
 	public PowerStationConstructionData addOrUpdate(PowerStationConstructionData powerStationConstructionData) {
-		//如果不是提交进行单独保存
-		if(powerStationConstructionData.isCommitFlow()){
+		// 如果不是提交进行单独保存
+		if (powerStationConstructionData.isCommitFlow()) {
 //        if(powerStationConstructionData.getSequenceNbr()!=null){
 			// 修改施工电站状态
 			LambdaUpdateWrapper<WorkOrderPowerStation> up = new LambdaUpdateWrapper();
@@ -295,29 +312,35 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			workOrderMapper.update(null, upq);
 
 		}
-        // 新增施工信息
-        // 防止重复添加
-        LambdaUpdateWrapper<PowerStationConstructionData> psc = new LambdaUpdateWrapper();
-        psc.eq(PowerStationConstructionData::getWorkOrderPowerStationId,
-                powerStationConstructionData.getWorkOrderPowerStationId());
-        psc.eq(PowerStationConstructionData::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
-        powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData, psc);
-        // powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData);
 		
 		// 增加操作日志
 		if (powerStationConstructionData.getSequenceNbr() != null) {
 			ConstructionRecords da = new ConstructionRecords(powerStationConstructionData.getRecUserName(), "编辑施工资料",
 					new Date(), "", powerStationConstructionData.getWorkOrderId(),
 					powerStationConstructionData.getWorkOrderPowerStationId(), null, "");
-            constructionRecordsServiceImpl.save(da);
+			LambdaUpdateWrapper<ConstructionRecords> pcr = new LambdaUpdateWrapper<>();
+			pcr.eq(ConstructionRecords::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
+			constructionRecordsServiceImpl.saveOrUpdate(da,pcr);
 
 		} else {
 			ConstructionRecords da = new ConstructionRecords(powerStationConstructionData.getRecUserName(), "新增施工资料",
 					new Date(), "", powerStationConstructionData.getWorkOrderId(),
 					powerStationConstructionData.getWorkOrderPowerStationId(), null, "");
-            constructionRecordsServiceImpl.save(da);
+			LambdaUpdateWrapper<ConstructionRecords> pcr = new LambdaUpdateWrapper<>();
+			pcr.eq(ConstructionRecords::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
+			constructionRecordsServiceImpl.saveOrUpdate(da,pcr);
 		}
 		
+		// 新增施工信息
+		// 防止重复添加
+		LambdaUpdateWrapper<PowerStationConstructionData> psc = new LambdaUpdateWrapper<>();
+//		psc.eq(PowerStationConstructionData::getWorkOrderPowerStationId,
+//				powerStationConstructionData.getWorkOrderPowerStationId());
+		psc.eq(PowerStationConstructionData::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
+		powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData, psc);
+		// powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData);
+
+
 
 //        }else{
 //           //修改施工电站状态
@@ -843,7 +866,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		// 防止重复提交
 		LambdaQueryWrapper<PowerStationEngineeringInfo> pse = new LambdaQueryWrapper<>();
 		pse.eq(PowerStationEngineeringInfo::getWorkOrderId, powerStationEngineeringInfo.getWorkOrderId());
-		//pse.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,powerStationEngineeringInfo.getWorkOrderPowerStationId());
+		// pse.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,powerStationEngineeringInfo.getWorkOrderPowerStationId());
 		// powerStationEngineeringInfoService.saveOrUpdate(powerStationEngineeringInfo);
 		powerStationEngineeringInfoService.saveOrUpdate(powerStationEngineeringInfo, pse);
 		// 增加操作日志

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/warning/McbWarningMapper.xml

@@ -6,11 +6,11 @@
         SELECT
             COUNT(*) as count
         FROM
-            amos_mcb.mcb_warning_warning_info log
-                LEFT JOIN amos_mcb.mcb_warning_base_source_attribution source ON source.CODE = log.SOURCE_ATTRIBUTION
+            mcb_warning_warning_info log
+                LEFT JOIN mcb_warning_base_source_attribution source1 ON source1.CODE = log.SOURCE_ATTRIBUTION
         <where>
             date(log.CREATE_DATE) = CURRENT_DATE
-            and  WARNING_SOURCE_TYPE_CODE in (SELECT code FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW' )
+            and  WARNING_SOURCE_TYPE_CODE in (SELECT code FROM mcb_data_dictionary WHERE remark = 'OVERVIEW' )
             <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
                 AND SOURCE_ATTRIBUTION IN
                 <foreach collection="projectOrgCodes" item="item" open="(" separator="," close=")">
@@ -91,9 +91,9 @@
         IFNULL( count( log.SEQUENCE_NBR ), 0 ) AS seriesData,
         date( log.CREATE_DATE ) AS axisData
         FROM
-        amos_mcb.mcb_warning_warning_info log
+        mcb_warning_warning_info log
         WHERE
-        log.WARNING_SOURCE_TYPE_CODE IN ( SELECT CODE FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW' )
+        log.WARNING_SOURCE_TYPE_CODE IN ( SELECT CODE FROM mcb_data_dictionary WHERE remark = 'OVERVIEW' )
         AND date( log.CREATE_DATE ) >= CURDATE( ) - INTERVAL 7 DAY
         <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
             AND log.SOURCE_ATTRIBUTION IN
@@ -108,23 +108,23 @@
     <select id="queryWarningList" resultType="java.util.Map">
         SELECT
         log.SEQUENCE_NBR,
-            DATE_FORMAT(log.CREATE_DATE, '%Y-%m-%d %H:%i:%s') AS CREATE_DATE,
-            DATE_FORMAT(log.REC_DATE, '%Y-%m-%d %H:%i:%s') AS REC_DATE,
+        log.CREATE_DATE AS CREATE_DATE,
+        log.REC_DATE AS REC_DATE,
         log.EVENT_LEVEL_DESC,
         log.EVENT_LEVEL,
         log.SOURCE_ATTRIBUTION_DESC,
         log.SOURCE_ATTRIBUTION,
         log.CONTENT,
-            LEVEL.COLOR,
-            source.PROVINCE,
+        warnLevel.COLOR,
+        source1.PROVINCE,
         log.WARNING_SOURCE_TYPE,
         log.OBJECT_NAME,
         log.PROCESSING_STATUS,
         log.PROCESSING_STATUS_DESC
         FROM
-            amos_mcb.mcb_warning_warning_info log
-                LEFT JOIN amos_mcb.mcb_warning_base_warning_level LEVEL ON log.EVENT_LEVEL = LEVEL.CODE and LEVEL.SEQUENCE_NBR in (1, 2, 3)
-	            LEFT JOIN amos_mcb.mcb_warning_base_source_attribution source ON source.CODE = log.SOURCE_ATTRIBUTION
+        mcb_warning_warning_info log
+        LEFT JOIN mcb_warning_base_warning_level warnLevel ON log.EVENT_LEVEL = warnLevel.CODE and warnLevel.SEQUENCE_NBR in (1, 2, 3)
+        LEFT JOIN mcb_warning_base_source_attribution source1 ON source1.CODE = log.SOURCE_ATTRIBUTION
         <where>
             <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
                 AND log.SOURCE_ATTRIBUTION IN
@@ -165,11 +165,11 @@
 
     <select id="queryWarningCount" resultType="java.lang.Long">
         SELECT
-            count(*)
+        COUNT(1)
         FROM
-            amos_mcb.mcb_warning_warning_info log
-                LEFT JOIN amos_mcb.mcb_warning_base_warning_level LEVEL ON log.EVENT_LEVEL = LEVEL.CODE and LEVEL.SEQUENCE_NBR in (1, 2, 3)
-                LEFT JOIN amos_mcb.mcb_warning_base_source_attribution source ON source.CODE = log.SOURCE_ATTRIBUTION
+        mcb_warning_warning_info log
+        LEFT JOIN mcb_warning_base_warning_level warnLevel ON log.EVENT_LEVEL = warnLevel.CODE and warnLevel.SEQUENCE_NBR in (1, 2, 3)
+        LEFT JOIN mcb_warning_base_source_attribution source1 ON source1.CODE = log.SOURCE_ATTRIBUTION
         <where>
             <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
                 AND log.SOURCE_ATTRIBUTION IN
@@ -270,18 +270,18 @@
             question.SOURCE_ATTRIBUTION,
             question.CONTENT,
             question.LEVEL_DESC,
-            source.PROVINCE
+            source1.PROVINCE
         FROM
         (SELECT
         QUESTION_NUM
         FROM
-        amos_mcb.mcb_warning_warning_info
+        mcb_warning_warning_info
         WHERE
         mcb_warning_warning_info.PROCESSING_STATUS = 2
         AND QUESTION_NUM IS NOT NULL
-        AND mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE IN ( SELECT CODE FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW' )
-        ) warnNum LEFT  join   amos_mcb.mcb_warning_question_info question on question.NUM = warnNum.QUESTION_NUM
-        LEFT JOIN amos_mcb.mcb_warning_base_source_attribution source ON source.CODE = question.SOURCE_ATTRIBUTION
+        AND mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE IN ( SELECT CODE FROM mcb_data_dictionary WHERE remark = 'OVERVIEW' )
+        ) warnNum LEFT  join   mcb_warning_question_info question on question.NUM = warnNum.QUESTION_NUM
+        LEFT JOIN mcb_warning_base_source_attribution source1 ON source1.CODE = question.SOURCE_ATTRIBUTION
         <where>
             question.COMPLETION_STATUS != 1
             <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
@@ -324,7 +324,7 @@
         <if test="completionStatus != null and completionStatus != 0">
             AND question.COMPLETION_STATUS = #{completionStatus}
         </if>
-        LEFT JOIN mcb_warning_base_source_attribution source ON source.CODE = question.SOURCE_ATTRIBUTION
+        LEFT JOIN mcb_warning_base_source_attribution source1 ON source1.CODE = question.SOURCE_ATTRIBUTION
         <where>
             <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
                 AND question.SOURCE_ATTRIBUTION IN
@@ -351,9 +351,9 @@
                     SUM(IFNULL(RPN, 0)) AS totalRPN,
                     COUNT(SEQUENCE_NBR) AS todayAlarm
                 FROM
-                    amos_mcb.mcb_warning_warning_info
+                    mcb_warning_warning_info
                 WHERE
-            date(CREATE_DATE) = CURRENT_DATE and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW')
+            date(CREATE_DATE) = CURRENT_DATE and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM mcb_data_dictionary WHERE remark = 'OVERVIEW')
         GROUP BY
             SOURCE_ATTRIBUTION
             )
@@ -370,11 +370,11 @@
             COALESCE(sq.totalRPN / NULLIF(COUNT(b.SOURCE_ATTRIBUTION), 0), 0) AS rpn,
             IFNULL(sq.todayAlarm,0) as todayAlarm
         FROM
-            amos_mcb.mcb_warning_base_source_attribution a
+            mcb_warning_base_source_attribution a
                 LEFT JOIN
             SubQuery sq ON a.CODE = sq.SOURCE_ATTRIBUTION
                 LEFT JOIN
-            amos_mcb.mcb_warning_warning_info b ON a.CODE = b.SOURCE_ATTRIBUTION AND date(b.CREATE_DATE) = CURRENT_DATE
+            mcb_warning_warning_info b ON a.CODE = b.SOURCE_ATTRIBUTION AND date(b.CREATE_DATE) = CURRENT_DATE
         <where>
             <if test="sourceAttribution != null and sourceAttribution != ''">
                 a.CODE LIKE CONCAT(#{sourceAttribution}, '%')
@@ -390,7 +390,7 @@
         SELECT
             count( 1 ) AS yearNum
         FROM
-            amos_mcb.mcb_warning_warning_info
+            mcb_warning_warning_info
                 Left join mcb_warning_base_source_attribution mwbsa  on mwbsa.CODE = mcb_warning_warning_info.SOURCE_ATTRIBUTION
         WHERE
             YEAR(CREATE_DATE) = YEAR(CURDATE())
@@ -400,14 +400,14 @@
         <if test="sourceAttribution != null and sourceAttribution != '' ">
             and mwbsa.CODE LIKE  CONCAT (#{sourceAttribution},'%')
         </if>
-        and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW')
+        and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM mcb_data_dictionary WHERE remark = 'OVERVIEW')
 
   	</select>
     <select id="getMonthTotal" resultType="integer">
         SELECT
             count( 1 ) AS monNum
         FROM
-            amos_mcb.mcb_warning_warning_info
+            mcb_warning_warning_info
                 Left join mcb_warning_base_source_attribution mwbsa  on mwbsa.CODE = mcb_warning_warning_info.SOURCE_ATTRIBUTION
         WHERE
             MONTH(CREATE_DATE) = MONTH(CURDATE())
@@ -417,14 +417,14 @@
         <if test="sourceAttribution != null and sourceAttribution != '' ">
             and mwbsa.CODE LIKE  CONCAT (#{sourceAttribution},'%')
         </if>
-        and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW')
+        and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM mcb_data_dictionary WHERE remark = 'OVERVIEW')
     </select>
     <select id="getDayTotal" resultType="integer">
         SELECT
             count( 1 ) AS dayNUM ,
             mwbsa.PROVINCE
         FROM
-            amos_mcb.mcb_warning_warning_info
+            mcb_warning_warning_info
                 Left join mcb_warning_base_source_attribution mwbsa  on mwbsa.CODE = mcb_warning_warning_info.SOURCE_ATTRIBUTION
         WHERE
             DATE_FORMAT(CREATE_DATE,'%Y-%m-%d') =  CURDATE()
@@ -434,6 +434,6 @@
         <if test="sourceAttribution != null and sourceAttribution != '' ">
             and mwbsa.CODE LIKE  CONCAT (#{sourceAttribution},'%')
         </if>
-        and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW')
+        and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM mcb_data_dictionary WHERE remark = 'OVERVIEW')
 </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/application-dev1.properties

@@ -34,11 +34,11 @@ spring.db3.datasource.password=taosdata
 spring.db3.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
 
 ## eureka properties:
-eureka.instance.hostname=10.20.1.160
+eureka.instance.hostname=47.92.234.253
 eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
 ## redis properties:
 spring.redis.database=1
-spring.redis.host=10.20.1.210
+spring.redis.host=47.92.234.253
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 
@@ -74,10 +74,10 @@ lettuce.timeout=10000
 
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.10.220:1883
+emqx.broker=tcp://47.92.234.253:1883
 emqx.user-name=admin
 emqx.password=public
-mqtt.scene.host=mqtt://172.16.10.220:8083/mqtt
+mqtt.scene.host=mqtt://47.92.234.253:18083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/application.properties

@@ -90,3 +90,8 @@ spring.elasticsearch.rest.read-timeout=30000
 
 #elasticsearch.username= elastic
 #elasticsearch.password= 123456
+
+amos.system.user.user-name=cz
+amos.system.user.password=a1234567
+amos.system.user.product=AMOS_STUDIO_WEB
+amos.system.user.app-key=AMOS_STUDIO
\ No newline at end of file