diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/notice/McConstructionTemplate.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/notice/McConstructionTemplate.java
new file mode 100644
index 0000000..32f3ec0
--- /dev/null
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/notice/McConstructionTemplate.java
@@ -0,0 +1,24 @@
+package com.chinagas.modules.schsf.domain.notice;
+
+import com.chinagas.modules.schsf.domain.McConstruction;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+public class McConstructionTemplate {
+    private McConstruction mcConstruction;
+    public McConstructionTemplate(McConstruction mcConstruction) {
+        this.mcConstruction = mcConstruction;
+    }
+    public String getNoticemarkdown() {
+        return  "######  市场化收费-施工通知  \n  " +
+                "村/小区：" + mcConstruction.getVlgOrCmty() + "  \n  " +
+                "当前状态：" + mcConstruction.getStatusName() + "  \n  " +
+                "维护操作：点击链接进入维护页面：[https://schsf.chinagasholdings.com](https://schsf.chinagasholdings.com)  \n  " +
+                "---" +
+                "  \n  " +
+                "通知日期： " + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm")) + "  \n  " +
+                "温馨提醒： 请按时完成维护，保障业务顺畅。  \n  ";
+    }
+
+}
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McConstructionMapper.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McConstructionMapper.java
index 8d7cc14..425e8d3 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McConstructionMapper.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McConstructionMapper.java
@@ -1,6 +1,8 @@
 package com.chinagas.modules.schsf.mapper;
 
 import com.chinagas.modules.schsf.domain.McConstruction;
+import com.chinagas.modules.schsf.domain.dto.NodeUsersDto;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -63,4 +65,6 @@ public interface McConstructionMapper
 
 
     List<McConstruction> selectMcConstructionByData(McConstruction mcConstruction);
+
+    List<NodeUsersDto> selectMcConstructionNodeUserList(@Param("id")String id, @Param("nodeType") String nodeType);
 }
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcConstructionService.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcConstructionService.java
index 9b243a0..fac9d74 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcConstructionService.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcConstructionService.java
@@ -2,6 +2,8 @@ package com.chinagas.modules.schsf.service;
 
 import com.chinagas.modules.schsf.domain.McBasicCmty;
 import com.chinagas.modules.schsf.domain.McConstruction;
+import com.chinagas.modules.schsf.domain.McVisit;
+import com.chinagas.modules.schsf.domain.dto.NodeUsersDto;
 
 import java.util.List;
 
@@ -85,4 +87,20 @@ public interface IMcConstructionService
      * @throws CloneNotSupportedException
      */
     int updateMcConstructionByOperations(McConstruction mcConstruction)  throws CloneNotSupportedException;
+
+
+    /**
+     * 根据拜访信息，发送钉钉通知
+     * @param mcVisit
+     */
+    void sendMcConstructionNotification(McVisit mcVisit);
+
+
+    /**
+     * 节点处理人
+     *
+     * @param id
+     * @return
+     */
+    List<NodeUsersDto> selectMcConstructionNodeUserList(Long id);
 }
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McConstructionServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McConstructionServiceImpl.java
index bf24962..33524e8 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McConstructionServiceImpl.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McConstructionServiceImpl.java
@@ -1,14 +1,22 @@
 package com.chinagas.modules.schsf.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson2.JSON;
+import com.chinagas.common.core.exceptions.ServiceException;
 import com.chinagas.common.core.utils.DateUtils;
 import com.chinagas.common.core.utils.StringUtils;
 import com.chinagas.common.datascope.annotation.DataScope;
 import com.chinagas.common.security.utils.SecurityUtils;
 import com.chinagas.modules.schsf.domain.McBasicCmty;
 import com.chinagas.modules.schsf.domain.McConstruction;
+import com.chinagas.modules.schsf.domain.McVisit;
+import com.chinagas.modules.schsf.domain.dto.NodeUsersDto;
+import com.chinagas.modules.schsf.domain.notice.McConstructionTemplate;
+import com.chinagas.modules.schsf.domain.notice.McIgnitionTemplate;
 import com.chinagas.modules.schsf.enums.ConstructionStatusEnums;
+import com.chinagas.modules.schsf.enums.IgnitionStatusEnums;
 import com.chinagas.modules.schsf.mapper.McConstructionMapper;
+import com.chinagas.modules.schsf.service.DingtalkService;
 import com.chinagas.modules.schsf.service.IMcConstructionService;
 import com.chinagas.modules.schsf.service.IMcOperationLogService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +24,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 施工维护Service业务层处理
@@ -31,6 +41,8 @@ public class McConstructionServiceImpl implements IMcConstructionService {
     private McConstructionMapper mcConstructionMapper;
     @Autowired
     private IMcOperationLogService iMcOperationLogService;
+    @Autowired
+    private DingtalkService dingtalkService;
 
     /**
      * 查询施工维护
@@ -119,10 +131,12 @@ public class McConstructionServiceImpl implements IMcConstructionService {
         mcConstruction.setGroupName(mcBasicCmty.getGroupName());
         mcConstruction.setCompanyCode(mcBasicCmty.getCompanyCode());
         mcConstruction.setCompanyName(mcBasicCmty.getCompanyName());
-        mcConstruction.setProvince(mcBasicCmty.getProvince());
-        mcConstruction.setCity(mcBasicCmty.getCity());
-        mcConstruction.setDistrict(mcBasicCmty.getDistrict());
-        mcConstruction.setStreet(mcBasicCmty.getStreet());
+
+        mcConstruction.setProvince(mcBasicCmty.getProvince()==null?"":mcBasicCmty.getProvince());
+        mcConstruction.setCity(mcBasicCmty.getCity()==null?"":mcBasicCmty.getCity());
+        mcConstruction.setDistrict(mcBasicCmty.getDistrict()==null?"":mcBasicCmty.getDistrict());
+        mcConstruction.setStreet(mcBasicCmty.getStreet()==null?"":mcBasicCmty.getStreet());
+
         mcConstruction.setVlgOrCmty(mcBasicCmty.getVlgOrCmty());
         List<McConstruction> mcConstructions = mcConstructionMapper.selectMcConstructionByData(mcConstruction);
         if (mcConstructions != null && !mcConstructions.isEmpty()) {
@@ -202,6 +216,9 @@ public class McConstructionServiceImpl implements IMcConstructionService {
 
         iMcOperationLogService.insertMcOperationLog("mc_construction", mcConstruction_param.getId(), "schsf:mcConstruction:engineering",
                 "工程维护", "1", null, JSON.toJSONString(mcConstruction_old), JSON.toJSONString(mcConstruction_new));
+        if (i>0){
+            this.sendNotification(mcConstruction_param.getId());
+        }
         return i;
     }
 
@@ -242,4 +259,55 @@ public class McConstructionServiceImpl implements IMcConstructionService {
                 "运营维护", "1", null, JSON.toJSONString(mcConstruction_old), JSON.toJSONString(mcConstruction_new));
         return i;
     }
+
+    /**
+     * 发送施工维护通知
+     * @param mcVisit
+     */
+    @Override
+    public void sendMcConstructionNotification(McVisit mcVisit) {
+        McConstruction mcConstruction = new McConstruction();
+        mcConstruction.setRegionName(mcVisit.getRegionName());
+        mcConstruction.setGroupName(mcVisit.getGroupName());
+        mcConstruction.setCompanyCode(mcVisit.getCompanyCode());
+        mcConstruction.setCompanyName(mcVisit.getCompanyName());
+//        mcConstruction.setProvince(mcVisit.getProvince());
+//        mcConstruction.setCity(mcVisit.getCity());
+//        mcConstruction.setDistrict(mcVisit.getDistrict());
+//        mcConstruction.setStreet(mcVisit.getStreet());
+        mcConstruction.setVlgOrCmty(mcVisit.getVlgOrCmty());
+        mcConstruction.setStatusCode(ConstructionStatusEnums.MAINTENANCE_SG.getCode());
+        List<McConstruction> mcConstructions = mcConstructionMapper.selectMcConstructionByData(mcConstruction);
+        for (McConstruction construction : mcConstructions) {
+            this.sendNotification(construction.getId());
+        }
+    }
+
+    private void sendNotification(Long id) {
+        McConstruction construction = mcConstructionMapper.selectMcConstructionById(id);
+        if (BeanUtil.isEmpty(construction)) {
+            throw new ServiceException("未查询到记录");
+        }
+        List<NodeUsersDto> nodeUsersDtos = this.selectMcConstructionNodeUserList(construction.getId());
+        if (nodeUsersDtos != null && nodeUsersDtos.size()>0) {
+            List<String> userIds = nodeUsersDtos.stream().filter(mcVisitNodeUsersDto -> StringUtils.isNotEmpty(mcVisitNodeUsersDto.getDingTalkUserId())).map(NodeUsersDto::getDingTalkUserId).collect(Collectors.toList());
+            dingtalkService.sendMarketFeeNotification(userIds, "市场化收费-施工维护", new McConstructionTemplate(construction).getNoticemarkdown());
+        }
+    }
+
+    @Override
+    public List<NodeUsersDto> selectMcConstructionNodeUserList(Long id) {
+        McConstruction mcConstruction = mcConstructionMapper.selectMcConstructionById(id);
+        if (BeanUtil.isEmpty(mcConstruction)) {
+            throw new ServiceException("未查询到记录");
+        }
+        if (mcConstruction.getStatusCode().equals(ConstructionStatusEnums.MAINTENANCE_SG.getCode())) {
+        //待工程维护 schsf:mcConstruction:engineering
+            return mcConstructionMapper.selectMcConstructionNodeUserList(String.valueOf(id), "schsf:mcConstruction:engineering");
+        }else if (mcConstruction.getStatusCode().equals(ConstructionStatusEnums.MAINTENANCE_YY.getCode())){
+        //待运营维护 schsf:mcConstruction:operations
+            return mcConstructionMapper.selectMcConstructionNodeUserList(String.valueOf(id), "schsf:mcConstruction:operations");
+        }
+        return Collections.emptyList();
+    }
 }
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java
index 8f16df4..cec194c 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java
@@ -63,6 +63,9 @@ public class McVisitServiceImpl implements IMcVisitService {
     private IMcBasicCmtyService iMcBasicCmtyService;
     @Autowired
     private DingtalkService dingtalkService;
+    @Autowired
+    private IMcConstructionService iMcConstructionService;
+
 
     /**
      * 查询拜访工单
@@ -411,6 +414,8 @@ public class McVisitServiceImpl implements IMcVisitService {
                 //2：判断是否需要添加至点火记录
                 if (status.equals(YesNoEnums.Y.getName())) {
                     iMcIgnitionService.insertMcVisitByMcIgnition(mcVisit);
+                    //施工维护通知
+                    iMcConstructionService.sendMcConstructionNotification(mcVisit);
                 }
                 procRole = "项目公司_财务";
                 break;
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McConstructionMapper.xml b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McConstructionMapper.xml
index f1a4d50..848139f 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McConstructionMapper.xml
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McConstructionMapper.xml
@@ -223,15 +223,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectMcConstructionByData" resultMap="McConstructionResult" parameterType="com.chinagas.modules.schsf.domain.McConstruction" >
         <include refid="selectMcConstructionVo"/>
-        where 1=1
-        and t.region_name = #{regionName}
-        and t.group_name =  #{groupName}
-        and t.company_name = #{companyName}
-        and t.company_code = #{companyCode}
-        and t.province = #{province}
-        and t.city = #{city}
-        and t.district = #{district}
-        and t.street = #{street}
+        where 1 = 1
+          and t.region_name = #{regionName}
+          and t.group_name = #{groupName}
+          and t.company_name = #{companyName}
+          and t.company_code = #{companyCode}
+        <if test="province != null">
+            and t.province = #{province}
+        </if>
+        <if test="city != null">
+            and t.city = #{city}
+        </if>
+        <if test="district != null">
+            and t.district = #{district}
+        </if>
+        <if test="street != null">
+            and t.street = #{street}
+        </if>
+        <if test="statusCode != null">
+            and status_code = #{statusCode}
+        </if>
         and t.vlg_or_cmty = #{vlgOrCmty}
     </select>
+
+    <select id="selectMcConstructionNodeUserList" resultType="com.chinagas.modules.schsf.domain.dto.NodeUsersDto" parameterType="String">
+        SELECT DISTINCT us.user_name,us.nick_name,un.user_id,un.ding_talk_union_id,un.ding_talk_user_id
+        FROM sys_menu menu
+        INNER JOIN sys_role_menu roleMenu on roleMenu.menu_id=menu.menu_id
+        INNER JOIN sys_role role on role.role_id= roleMenu.role_id
+        INNER JOIN sys_user_role userRole on userRole.role_id = role.role_id
+        INNER JOIN sys_user us on us.user_id = userRole.user_id
+        LEFT JOIN  sys_user_unite un on un.user_id=us.user_id
+        WHERE menu.perms=#{nodeType,jdbcType=VARCHAR}
+        and role.data_scope='1'
+        UNION
+        SELECT DISTINCT us.user_name,us.nick_name,un.user_id,un.ding_talk_union_id,un.ding_talk_user_id
+        FROM sys_menu menu
+        INNER JOIN sys_role_menu roleMenu on roleMenu.menu_id=menu.menu_id
+        INNER JOIN sys_role role on role.role_id= roleMenu.role_id
+        INNER JOIN sys_user_role userRole on userRole.role_id = role.role_id
+        INNER JOIN sys_user us on us.user_id = userRole.user_id
+        INNER JOIN sys_user_dept userDept  on userDept.user_id=us.user_id and userDept.dept_id in ( SELECT construction.company_code FROM mc_construction construction WHERE construction.id=#{id})
+        LEFT JOIN  sys_user_unite un on un.user_id=us.user_id
+        WHERE menu.perms=#{nodeType,jdbcType=VARCHAR}
+        and role.data_scope='3'
+        UNION
+        SELECT DISTINCT us.user_name,us.nick_name,un.user_id,un.ding_talk_union_id,un.ding_talk_user_id
+        FROM sys_menu menu
+        INNER JOIN sys_role_menu roleMenu on roleMenu.menu_id=menu.menu_id
+        INNER JOIN sys_role role on role.role_id= roleMenu.role_id
+        INNER JOIN sys_user_role userRole on userRole.role_id = role.role_id
+        INNER JOIN sys_user us on us.user_id = userRole.user_id
+        INNER JOIN sys_user_dept userDept  on userDept.user_id=us.user_id
+        INNER JOIN sys_dept dept on dept.dept_id =userDept.dept_id
+        INNER JOIN sys_dept dept2 on dept2.dept_id in (SELECT a.dept_id FROM sys_dept a WHERE a.dept_id = dept.dept_id or find_in_set(  dept.parent_id , ancestors ) )
+        and dept2.dept_id  = (SELECT construction.company_code FROM mc_construction construction WHERE construction.id=#{id} )
+        LEFT JOIN  sys_user_unite un on un.user_id=us.user_id
+        WHERE menu.perms= #{nodeType,jdbcType=VARCHAR}
+        and role.data_scope='4'
+        UNION
+        SELECT DISTINCT us.user_name,us.nick_name,un.user_id,un.ding_talk_union_id,un.ding_talk_user_id
+        FROM sys_menu menu
+        INNER JOIN sys_role_menu roleMenu on roleMenu.menu_id=menu.menu_id
+        INNER JOIN sys_role role on role.role_id= roleMenu.role_id
+        INNER JOIN sys_user_role userRole on userRole.role_id = role.role_id and userRole.user_id = (SELECT construction.create_by FROM mc_construction construction WHERE construction.id=#{id} )
+        INNER JOIN sys_user us on us.user_id = userRole.user_id
+        LEFT JOIN  sys_user_unite un on un.user_id=us.user_id
+        WHERE menu.perms=#{nodeType,jdbcType=VARCHAR}
+        and role.data_scope='5'
+    </select>
 </mapper>
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McIgnitionMapper.xml b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McIgnitionMapper.xml
index 45c03b8..8a373e2 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McIgnitionMapper.xml
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McIgnitionMapper.xml
@@ -207,7 +207,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectMcIgnitionParamList" parameterType="com.chinagas.modules.schsf.domain.McIgnition" resultMap="McIgnitionResult">
         <include refid="selectMcIgnitionVo"/>
         where 1=1
-            and t.status_code !='MAINTENANCE'
+            and t.status_code !='CANCEL'
             and t.def_flag ='0'
             and t.region_name  = #{regionName}
             and t.group_name = #{groupName}
--
libgit2 0.21.2