1

pro-base/src/main/java/com/idea/customerManagement/dto/RoomSelectionInfoDto.java

@@ -51,4 +51,6 @@ public class RoomSelectionInfoDto extends RoomSelectionInfo {
 
     private String roomSelectionDate;
 
+    private String statusStr;
+
 }

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyPaymentSettleController.java

@@ -26,6 +26,7 @@ import com.rockstar.frame.service.FrameUserService;
 import com.rockstar.shiro.util.ShiroUtils;
 import com.rockstar.util.UUIDUtils;
 import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -47,6 +48,7 @@ import java.util.Map;
 /**
  * Created by zt on 2023
  */
+@Slf4j
 @Controller
 @RequestMapping(value = "/ApplyPaymentSettleController")
 @Api(value = "分表_付款申请")
@@ -165,7 +167,8 @@ public class ApplyPaymentSettleController extends BaseController {
 
 
                 // 先处理待办
-                String param = "id=" + flowMain.getId();
+                String param = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId()
+                        + "&applyUser=" + flowMain.getApplyUser();
                 parkWaitHandleService.userHandle(HandleTypeEnum.FK, param, ShiroUtils.getUserId());
 
                 FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
@@ -285,80 +288,88 @@ public class ApplyPaymentSettleController extends BaseController {
                 ConstantFlowType.PAYMENT_PROCESSDEFINE, ConstantFlowType.PAYMENT_DEPLOYMENTID,
                 feeMoneyTotalMap, ConstantFlowType.PAYMENT_NAME, ConstantFlowType.PAYMENT,ShiroUtils.getUser());
 
-        // TODO: 2024/11/21   和泛OA对接 推送待办
-        String syscode = "CESHI";
-        String flowId = "";
-        String requestname = applyTheme;
-        String workflowname = ConstantFlowType.PAYMENT_NAME;
-        String nodeName = "";
-        String pcurl = serverUrl;
-        String appurl = "";
-        String isremark = "0";
-        String viewtype = "0";
-        // TODO: 2024/11/15 创建者和接收者需求oa协商
-        String creator = "";
-        String receiver = "";
-        String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
-        String receivets = System.currentTimeMillis()+ "";
-
-        FlowMainExample flowMainExample = new FlowMainExample();
-        flowMainExample.createCriteria().andFormIdEqualTo(id).andFlowTypeEqualTo(ConstantFlowType.PAYMENT);
-        List<FlowMain> flowMains = flowMainService.selectByExample(flowMainExample);
-        if(CollectionUtils.isNotEmpty(flowMains)){
-            FlowMain flowMain = flowMains.get(0);
-            flowId = flowMain.getId();
-
-            FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
-            flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
-            List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
-            if(CollectionUtils.isNotEmpty(flowMainPushes)){
-                FlowMainPush flowMainPush = flowMainPushes.get(0);
-                nodeName = flowMainPush.getNodeName();
+        try {
+
+            // TODO: 2024/11/21   和泛OA对接 推送待办
+            String syscode = "CESHI";
+            String flowId = "";
+            String requestname = applyTheme;
+            String workflowname = ConstantFlowType.PAYMENT_NAME;
+            String nodeName = "";
+            String pcurl = serverUrl;
+            String appurl = "";
+            String isremark = "0";
+            String viewtype = "0";
+            // TODO: 2024/11/15 创建者和接收者需求oa协商
+            String creator = "";
+            String receiver = "";
+            String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
+            String receivets = System.currentTimeMillis()+ "";
+
+            FlowMainExample flowMainExample = new FlowMainExample();
+            flowMainExample.createCriteria().andFormIdEqualTo(id).andFlowTypeEqualTo(ConstantFlowType.PAYMENT);
+            List<FlowMain> flowMains = flowMainService.selectByExample(flowMainExample);
+            if(CollectionUtils.isNotEmpty(flowMains)){
+                FlowMain flowMain = flowMains.get(0);
+                flowId = flowMain.getId();
 
-                JSONObject json = new JSONObject();
-                json.put("syscode",syscode);
-                json.put("flowId",flowId);
-                json.put("requestname",requestname);
-                json.put("workflowname",workflowname);
-                json.put("nodeName",nodeName);
-                json.put("pcurl",pcurl);
-                json.put("appurl",appurl);
-                json.put("isremark",isremark);
-                json.put("viewtype",viewtype);
-                json.put("creator",creator);
-                json.put("receiver",receiver);
-                json.put("date",date);
-                json.put("receivets",receivets);
+                FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
+                flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
+                List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
+                if(CollectionUtils.isNotEmpty(flowMainPushes)){
+                    FlowMainPush flowMainPush = flowMainPushes.get(0);
+                    nodeName = flowMainPush.getNodeName();
+
+                    JSONObject json = new JSONObject();
+                    json.put("syscode",syscode);
+                    json.put("flowId",flowId);
+                    json.put("requestname",requestname);
+                    json.put("workflowname",workflowname);
+                    json.put("nodeName",nodeName);
+                    json.put("pcurl",pcurl);
+                    json.put("appurl",appurl);
+                    json.put("isremark",isremark);
+                    json.put("viewtype",viewtype);
+                    json.put("creator",creator);
+                    json.put("receiver",receiver);
+                    json.put("date",date);
+                    json.put("receivets",receivets);
 
-                // 给本系统下一个节点的人推送待办
-                /**
-                 * 添加待办
-                 * @param title 显示标题
-                 * @param typeEnum 处理类型枚举
-                 * @param srcUserType 来源用户类型 0管理,1企业
-                 * @param srcUserId 来源用户id
-                 * @param srcUserName 来源用户名称
-                 * @param receiveUserId 接收用户id or 0=全部  or 角色id
-                 * @param routeParam 跳转携带参数，例： id=***&type=**
-                 */
-                String title = applyTheme;
-                HandleTypeEnum typeEnum = HandleTypeEnum.FK;
-                Integer srcUserType = 0;//来源用户类型 0管理,1企业
-                String srcUserId = ShiroUtils.getUserId();
-                String srcUserName = ShiroUtils.getLoginName();
-                String receiveUserId = flowMainPush.getPushUser();
-                String routeParam = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();;
-                parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName,
-                        receiveUserId, routeParam);
+                    // 给本系统下一个节点的人推送待办
+                    /**
+                     * 添加待办
+                     * @param title 显示标题
+                     * @param typeEnum 处理类型枚举
+                     * @param srcUserType 来源用户类型 0管理,1企业
+                     * @param srcUserId 来源用户id
+                     * @param srcUserName 来源用户名称
+                     * @param receiveUserId 接收用户id or 0=全部  or 角色id
+                     * @param routeParam 跳转携带参数，例： id=***&type=**
+                     */
+                    String title = applyTheme;
+                    HandleTypeEnum typeEnum = HandleTypeEnum.FK;
+                    Integer srcUserType = 0;//来源用户类型 0管理,1企业
+                    String srcUserId = ShiroUtils.getUserId();
+                    String srcUserName = ShiroUtils.getLoginName();
+                    String receiveUserId = flowMainPush.getPushUser();
+                    String routeParam = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();;
+                    parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName,
+                            receiveUserId, routeParam);
+
+                }
 
             }
 
+        }catch (Exception e){
+            log.error("发起流程后续报错",e);
         }
 
 
 
 
 
+
+
         if (ajaxResult.get("code").equals(1688)) {
 //            //表成功了 且已经审核完成
 ////            需要进行后续的处理

pro-base/src/main/resources/mybatis/customerManagement/RoomSelectionInfoExtendMapper.xml

@@ -40,6 +40,9 @@
             <if test="buyerName != null and buyerName != ''">
                 and room_selection_info.customer_management_id in (select customer_management_id from buyer where name like concat('%',#{buyerName},'%'))
             </if>
+            <if test="statusStr != null and statusStr != ''">
+                and room_selection_info.status in (${statusStr})
+            </if>
             <if test="discIdList != null">
                 and room_selection_info.disc_id in
                 <foreach collection="discIdList" item="discId" separator="," open="(" close=")">
@@ -49,6 +52,9 @@
             <if test="customerManagementId !=null and customerManagementId != ''">
                 and room_selection_info.customer_management_id = #{customerManagementId}
             </if>
+            <if test="roomNo !=null and roomNo != ''">
+                and park_room.room_no like concat('%',#{roomNo},'%')
+            </if>
         </where>
         order by created_at desc
     </select>

pro-base/src/main/resources/mybatis/my/MyMenuMapper.xml

@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.idea.my.mapper.MyMenuMapper">
+  <resultMap id="BaseResultMap" type="com.idea.my.model.MyMenu">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="user_id" jdbcType="VARCHAR" property="userId" />
+    <result column="menu_id" jdbcType="VARCHAR" property="menuId" />
+    <result column="created_by" jdbcType="VARCHAR" property="createdBy" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_by" jdbcType="VARCHAR" property="updatedBy" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, user_id, menu_id, created_by, created_at, updated_by, updated_at
+  </sql>
+  <select id="selectByExample" parameterType="com.idea.my.model.MyMenuExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from sys_my_menu
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from sys_my_menu
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from sys_my_menu
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.idea.my.model.MyMenuExample">
+    delete from sys_my_menu
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.idea.my.model.MyMenu">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.String">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into sys_my_menu (id,user_id, menu_id, created_by,
+      created_at, updated_by, updated_at
+      )
+    values (#{id,jdbcType=VARCHAR},#{userId,jdbcType=VARCHAR}, #{menuId,jdbcType=VARCHAR}, #{createdBy,jdbcType=VARCHAR},
+      #{createdAt,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=VARCHAR}, #{updatedAt,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.idea.my.model.MyMenu">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.String">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into sys_my_menu
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="userId != null">
+        user_id,
+      </if>
+      <if test="menuId != null">
+        menu_id,
+      </if>
+      <if test="createdBy != null">
+        created_by,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedBy != null">
+        updated_by,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="userId != null">
+        #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="menuId != null">
+        #{menuId,jdbcType=VARCHAR},
+      </if>
+      <if test="createdBy != null">
+        #{createdBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedBy != null">
+        #{updatedBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.idea.my.model.MyMenuExample" resultType="java.lang.Long">
+    select count(*) from sys_my_menu
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update sys_my_menu
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.menuId != null">
+        menu_id = #{record.menuId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createdBy != null">
+        created_by = #{record.createdBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedBy != null">
+        updated_by = #{record.updatedBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update sys_my_menu
+    set id = #{record.id,jdbcType=VARCHAR},
+      user_id = #{record.userId,jdbcType=VARCHAR},
+      menu_id = #{record.menuId,jdbcType=VARCHAR},
+      created_by = #{record.createdBy,jdbcType=VARCHAR},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_by = #{record.updatedBy,jdbcType=VARCHAR},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.idea.my.model.MyMenu">
+    update sys_my_menu
+    <set>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="menuId != null">
+        menu_id = #{menuId,jdbcType=VARCHAR},
+      </if>
+      <if test="createdBy != null">
+        created_by = #{createdBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedBy != null">
+        updated_by = #{updatedBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.idea.my.model.MyMenu">
+    update sys_my_menu
+    set user_id = #{userId,jdbcType=VARCHAR},
+      menu_id = #{menuId,jdbcType=VARCHAR},
+      created_by = #{createdBy,jdbcType=VARCHAR},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_by = #{updatedBy,jdbcType=VARCHAR},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>