提案、催办

ruoyi-admin/src/main/java/com/ruoyi/web/controller/proposal/ProposalUserController.java

@@ -101,4 +101,15 @@ public class ProposalUserController extends BaseController
     {
         return toAjax(proposalUserService.deleteProposalUserByIds(ids));
     }
+
+    /**
+     * 联名提案人员确认
+     */
+    @PreAuthorize("@ss.hasPermi('proposal:user:verify')")
+    @Log(title = "提案人员", businessType = BusinessType.UPDATE)
+    @PostMapping("/verify")
+    public AjaxResult verify(@RequestBody ProposalUser proposalUser)
+    {
+        return toAjax(proposalUserService.verify(proposalUser));
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ProposalUserMapper.java

@@ -60,4 +60,6 @@ public interface ProposalUserMapper
     public int deleteProposalUserByIds(Long[] ids);
 
     void deleteProposalUserByProposalId(Long proposalId);
+
+    int updateProposalUserVerify(ProposalUser proposalUser);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IProposalUserService.java

@@ -58,4 +58,6 @@ public interface IProposalUserService
      * @return 结果
      */
     public int deleteProposalUserById(Long id);
+
+    int verify(ProposalUser proposalUser);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ProposalUserServiceImpl.java

@@ -90,4 +90,10 @@ public class ProposalUserServiceImpl implements IProposalUserService
     {
         return proposalUserMapper.deleteProposalUserById(id);
     }
+
+    @Override
+    public int verify(ProposalUser proposalUser) {
+        proposalUser.setType("2");
+        return proposalUserMapper.updateProposalUserVerify(proposalUser);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZxUrgeServiceImpl.java

@@ -1,8 +1,16 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.ProposalInfo;
+import com.ruoyi.system.domain.ProposalUnitReply;
 import com.ruoyi.system.domain.urge.ZxUrge;
+import com.ruoyi.system.mapper.ProposalInfoMapper;
+import com.ruoyi.system.mapper.ProposalUnitReplyMapper;
 import com.ruoyi.system.mapper.ZxUrgeMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -19,6 +27,10 @@ public class ZxUrgeServiceImpl implements IZxUrgeService
 {
     @Autowired
     private ZxUrgeMapper zxUrgeMapper;
+    @Autowired
+    private ProposalInfoMapper proposalInfoMapper;
+    @Autowired
+    private ProposalUnitReplyMapper proposalUnitReplyMapper;
 
     /**
      * 查询政协催办
@@ -53,6 +65,29 @@ public class ZxUrgeServiceImpl implements IZxUrgeService
     @Override
     public int insertZxUrge(ZxUrge zxUrge)
     {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        //查询提案或者社情民意
+        if("1".equals(zxUrge.getUrgeType())){
+            //提案
+            ProposalInfo proposalInfo = proposalInfoMapper.selectProposalInfoByProposalId(zxUrge.getScoreId());
+            //查询主办单位
+            ProposalUnitReply proposalUnitReply = new ProposalUnitReply();
+            proposalUnitReply.setProposalId(zxUrge.getScoreId());
+            proposalUnitReply.setType("2");
+            List<ProposalUnitReply> proposalUnitReplies = proposalUnitReplyMapper.selectProposalUnitReplyList(proposalUnitReply);
+            if(proposalUnitReplies!=null && proposalUnitReplies.size()>0){
+                zxUrge.setAcceptDeptId(proposalUnitReplies.get(0).getDeptId());
+                zxUrge.setAcceptDept(proposalUnitReplies.get(0).getDeptName());
+            }else {
+                throw new ServiceException("当前提案未分配主办单位，催办失败！");
+            }
+            zxUrge.setUrgeTitle(proposalInfo.getTitle()+"的催办");
+            zxUrge.setIssuerId(user.getUserId());
+            zxUrge.setIssuer(user.getNickName());
+        }else{
+
+        }
+        zxUrge.setUrgeTime(DateUtils.getNowDate());
         zxUrge.setCreateTime(DateUtils.getNowDate());
         return zxUrgeMapper.insertZxUrge(zxUrge);
     }

ruoyi-system/src/main/resources/mapper/system/ProposalUserMapper.xml

@@ -71,6 +71,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where id = #{id}
     </update>
+    <update id="updateProposalUserVerify" parameterType="com.ruoyi.system.domain.ProposalUser">
+        update proposal_user set is_agree = #{isAgree} where proposal_id = #{proposalId} and type = #{type}
+    </update>
 
     <delete id="deleteProposalUserById" parameterType="Long">
         delete from proposal_user where id = #{id}

ruoyi-system/src/main/resources/mapper/system/ZxFjMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertZxFj" parameterType="ZxFj" useGeneratedKeys="true" keyProperty="id">
         insert into zx_fj
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="mainId != null "> main_id </if>
+            <if test="mainId != null "> main_id, </if>
             <if test="sourceId != null">source_id,</if>
             <if test="name != null and name != ''">name,</if>
             <if test="url != null">url,</if>
@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="mainId != null "> #{mainId}</if>
+            <if test="mainId != null "> #{mainId},</if>
             <if test="sourceId != null">#{sourceId},</if>
             <if test="name != null and name != ''">#{name},</if>
             <if test="url != null">#{url},</if>
@@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateZxFj" parameterType="ZxFj">
         update zx_fj
         <trim prefix="SET" suffixOverrides=",">
-            <if test="mainId != null ">main_id = #{mainId}</if>
+            <if test="mainId != null ">main_id = #{mainId},</if>
             <if test="sourceId != null">source_id = #{sourceId},</if>
             <if test="name != null and name != ''">name = #{name},</if>
             <if test="url != null">url = #{url},</if>