Merge remote-tracking branch 'origin/master'

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

@@ -117,7 +117,7 @@ public class CategoryProposalController extends BaseController
     }
 
     /**
-     * 查询部门列表（排除节点）
+     * 查询提案类别列表（排除节点）
      */
     @PreAuthorize("@ss.hasPermi('category:proposal:list')")
     @GetMapping("/list/exclude/{categoryId}")

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

@@ -36,11 +36,11 @@ public class ProposalInfoController extends BaseController
     @Autowired
     private IProposalInfoService proposalInfoService;
 
-/**
- * 查询提案信息列表
- */
-@PreAuthorize("@ss.hasPermi('proposalInfo:info:list')")
-@GetMapping("/list")
+    /**
+     * 查询提案信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('proposalInfo:info:list')")
+    @GetMapping("/list")
     public TableDataInfo list(ProposalInfo proposalInfo)
     {
         startPage();
@@ -48,6 +48,19 @@ public class ProposalInfoController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询联名提案信息列表(只查询附议)
+     */
+    @PreAuthorize("@ss.hasPermi('proposalInfo:info:jointlyList')")
+    @GetMapping("/jointlyList")
+    public TableDataInfo jointlyList(ProposalInfo proposalInfo)
+    {
+        startPage();
+        List<ProposalInfo> list = proposalInfoService.jointlyList(proposalInfo);
+        return getDataTable(list);
+    }
+
+
     /**
      * 导出提案信息列表
      */
@@ -127,6 +140,18 @@ public class ProposalInfoController extends BaseController
     }
 
 
+    /***
+     * 提案交办审核
+     */
+    @PreAuthorize("@ss.hasPermi('proposalInfo:info:assignsh')")
+    @Log(title = "提案信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/assignsh")
+    public AjaxResult assignsh(@RequestBody ProposalInfo proposalInfo)
+    {
+        return proposalInfoService.assignsh(proposalInfo);
+    }
+
+
     /***
      * 委员意见
      */
@@ -139,7 +164,7 @@ public class ProposalInfoController extends BaseController
     }
 
     /***
-     * 是否办结
+     * 政协意见
      */
     @PreAuthorize("@ss.hasPermi('proposalInfo:info:zxIdea')")
     @Log(title = "提案信息", businessType = BusinessType.UPDATE)
@@ -149,4 +174,28 @@ public class ProposalInfoController extends BaseController
         return proposalInfoService.zxIdea(proposalInfo);
     }
 
+    /***
+     * 推荐重点
+     */
+    @PreAuthorize("@ss.hasPermi('proposalInfo:info:keyPoint')")
+    @Log(title = "提案信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/keyPoint")
+    public AjaxResult keyPoint(@RequestBody ProposalInfo proposalInfo)
+    {
+        return proposalInfoService.keyPoint(proposalInfo);
+    }
+
+    /***
+     * 推荐优秀
+     */
+    @PreAuthorize("@ss.hasPermi('proposalInfo:info:outstanding')")
+    @Log(title = "提案信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/outstanding")
+    public AjaxResult outstanding(@RequestBody ProposalInfo proposalInfo)
+    {
+        return proposalInfoService.outstanding(proposalInfo);
+    }
+
+
+
 }

ruoyi-admin/src/main/resources/application.yml

@@ -72,4 +72,4 @@ xss:
   # 排除链接（多个用逗号分隔）
   excludes: /system/notice,/zxNotice/*
   # 匹配链接
-  urlPatterns: /system/*,/monitor/*,/tool/*,/zxNotice/*
+  urlPatterns: /system/*,/monitor/*,/tool/*,/zxNotice/*，,/category/*

ruoyi-system/src/main/java/com/ruoyi/system/domain/ProposalInfo.java

@@ -124,6 +124,10 @@ public class ProposalInfo extends BaseEntity
     @Excel(name = "被并案的案件id")
     private Long uniteProposalId;
 
+    /** 承办单位答复委员 */
+    @Excel(name = "承办单位答复委员")
+    private String cbdwdfwy;
+
     /** 委员满意程度（0：不满意，1：一般，2：满意，3：非常满意） */
     @Excel(name = "委员满意程度", readConverterExp = "0=：不满意，1：一般，2：满意，3：非常满意")
     private String satisfaction;
@@ -140,6 +144,23 @@ public class ProposalInfo extends BaseEntity
     @Excel(name = "政协意见")
     private String zxOpinion;
 
+    /** 是否推荐重点（0是 1否） */
+    @Excel(name = "是否推荐重点", readConverterExp = "0=是,1=否")
+    private String isKeyPoint;
+
+    /** 推荐重点理由 */
+    @Excel(name = "推荐重点理由")
+    private String keyPointArgument;
+
+    /** 是否推荐优秀（0是 1否） */
+    @Excel(name = "是否推荐优秀", readConverterExp = "0=是,1=否")
+    private String isOutstanding;
+
+    /** 推荐优秀理由 */
+    @Excel(name = "推荐优秀理由")
+    private String outstandingArgument;
+
+
     /** 提案人员 */
     private List<ProposalUser> proposalUserList;
     /** 附件 */
@@ -147,6 +168,64 @@ public class ProposalInfo extends BaseEntity
     /** 单位回复 */
     private List<ProposalUnitReply> proposalUnitReplyList;
 
+
+
+    /** 是否同意联名 */
+    private String isAgree;
+
+
+    public String getIsAgree() {
+        return isAgree;
+    }
+
+    public void setIsAgree(String isAgree) {
+        this.isAgree = isAgree;
+    }
+
+    public ProposalUnitReply getZbUnitReply() {
+        return zbUnitReply;
+    }
+
+    public void setZbUnitReply(ProposalUnitReply zbUnitReply) {
+        this.zbUnitReply = zbUnitReply;
+    }
+
+    /**主办单位*/
+    private ProposalUnitReply zbUnitReply;
+
+
+    public String getIsKeyPoint() {
+        return isKeyPoint;
+    }
+
+    public void setIsKeyPoint(String isKeyPoint) {
+        this.isKeyPoint = isKeyPoint;
+    }
+
+    public String getKeyPointArgument() {
+        return keyPointArgument;
+    }
+
+    public void setKeyPointArgument(String keyPointArgument) {
+        this.keyPointArgument = keyPointArgument;
+    }
+
+    public String getIsOutstanding() {
+        return isOutstanding;
+    }
+
+    public void setIsOutstanding(String isOutstanding) {
+        this.isOutstanding = isOutstanding;
+    }
+
+    public String getOutstandingArgument() {
+        return outstandingArgument;
+    }
+
+    public void setOutstandingArgument(String outstandingArgument) {
+        this.outstandingArgument = outstandingArgument;
+    }
+
     public List<ProposalUnitReply> getProposalUnitReplyList() {
         return proposalUnitReplyList;
     }
@@ -450,43 +529,52 @@ public class ProposalInfo extends BaseEntity
         return membersOpinion;
     }
 
+    public String getCbdwdfwy() {
+        return cbdwdfwy;
+    }
+
+    public void setCbdwdfwy(String cbdwdfwy) {
+        this.cbdwdfwy = cbdwdfwy;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("proposalId", getProposalId())
-            .append("proposalUserId", getProposalUserId())
-            .append("proposalNumber", getProposalNumber())
-            .append("title", getTitle())
-            .append("proposalName", getProposalName())
-            .append("proposalPhone", getProposalPhone())
-            .append("boundary", getBoundary())
-            .append("partyAffiliation", getPartyAffiliation())
-            .append("contactAddress", getContactAddress())
-            .append("categoryId", getCategoryId())
-            .append("categoryName", getCategoryName())
-            .append("proposalType", getProposalType())
-            .append("proposalContent", getProposalContent())
-            .append("isJointly", getIsJointly())
-            .append("isPublicity", getIsPublicity())
-            .append("contentPublicity", getContentPublicity())
-            .append("isSurvey", getIsSurvey())
-            .append("isFirst", getIsFirst())
-            .append("isPerson", getIsPerson())
-            .append("isRecord", getIsRecord())
-            .append("negotiateType", getNegotiateType())
-            .append("proposedContractor", getProposedContractor())
-            .append("proposalProgress", getProposalProgress())
-            .append("rollingProcess", getRollingProcess())
-            .append("complexType", getComplexType())
-            .append("isCasesTogether", getIsCasesTogether())
-            .append("uniteProposalId", getUniteProposalId())
-            .append("satisfaction", getSatisfaction())
-            .append("membersOpinion", getMembersOpinion())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return "ProposalInfo{" +
+                "proposalId=" + proposalId +
+                ", proposalUserId=" + proposalUserId +
+                ", proposalNumber='" + proposalNumber + '\'' +
+                ", title='" + title + '\'' +
+                ", proposalName='" + proposalName + '\'' +
+                ", proposalPhone='" + proposalPhone + '\'' +
+                ", boundary='" + boundary + '\'' +
+                ", partyAffiliation='" + partyAffiliation + '\'' +
+                ", contactAddress='" + contactAddress + '\'' +
+                ", categoryId=" + categoryId +
+                ", categoryName='" + categoryName + '\'' +
+                ", proposalType='" + proposalType + '\'' +
+                ", proposalContent='" + proposalContent + '\'' +
+                ", isJointly='" + isJointly + '\'' +
+                ", isPublicity='" + isPublicity + '\'' +
+                ", contentPublicity='" + contentPublicity + '\'' +
+                ", isSurvey='" + isSurvey + '\'' +
+                ", isFirst='" + isFirst + '\'' +
+                ", isPerson='" + isPerson + '\'' +
+                ", isRecord='" + isRecord + '\'' +
+                ", negotiateType='" + negotiateType + '\'' +
+                ", proposedContractor='" + proposedContractor + '\'' +
+                ", proposalProgress='" + proposalProgress + '\'' +
+                ", rollingProcess='" + rollingProcess + '\'' +
+                ", complexType='" + complexType + '\'' +
+                ", isCasesTogether='" + isCasesTogether + '\'' +
+                ", uniteProposalId=" + uniteProposalId +
+                ", satisfaction='" + satisfaction + '\'' +
+                ", membersOpinion='" + membersOpinion + '\'' +
+                ", zxSatisfaction='" + zxSatisfaction + '\'' +
+                ", zxOpinion='" + zxOpinion + '\'' +
+                ", isKeyPoint='" + isKeyPoint + '\'' +
+                ", keyPointArgument='" + keyPointArgument + '\'' +
+                ", isOutstanding='" + isOutstanding + '\'' +
+                ", outstandingArgument='" + outstandingArgument + '\'' +
+                '}';
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/ProposalUnitReply.java

@@ -32,6 +32,11 @@ public class ProposalUnitReply extends BaseEntity
     @Excel(name = "提案id")
     private Long proposalId;
 
+    /** 是否答复（0：是，1：否） */
+    @Excel(name = "是否答复（0：是，1：否）")
+    private String isReply;
+
+
     /** 答复内容 */
     @Excel(name = "答复内容")
     private String content;
@@ -43,6 +48,10 @@ public class ProposalUnitReply extends BaseEntity
     /** 附件 */
     private List<ZxFj> zxFjList;
 
+    public void setIsReply(String isReply) {
+        this.isReply = isReply;
+    }
+
     public List<ZxFj> getZxFjList() {
         return zxFjList;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/ProposalUser.java

@@ -18,6 +18,11 @@ public class ProposalUser extends BaseEntity
     /** ID */
     private Long id;
 
+
+    /** 提案id */
+    @Excel(name = "提案id")
+    private Long userId;
+
     /** 提案id */
     @Excel(name = "提案id")
     private Long proposalId;
@@ -34,7 +39,26 @@ public class ProposalUser extends BaseEntity
     @Excel(name = "地址类型 1：领衔，2：附议")
     private String type;
 
-    public void setId(Long id) 
+    /** 是否同意联名（0：待选择，1：同意，2：不同意） */
+    private String isAgree;
+
+    public String getIsAgree() {
+        return isAgree;
+    }
+
+    public void setIsAgree(String isAgree) {
+        this.isAgree = isAgree;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }

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

@@ -58,4 +58,6 @@ public interface ProposalInfoMapper
      * @return 结果
      */
     public int deleteProposalInfoByProposalIds(Long[] proposalIds);
+
+    List<ProposalInfo> selectProposalInfoListByUser(ProposalInfo proposalInfo);
 }

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

@@ -67,5 +67,13 @@ public interface IProposalInfoService
 
     AjaxResult idea(ProposalInfo proposalInfo);
 
+    AjaxResult keyPoint(ProposalInfo proposalInfo);
+
+    AjaxResult outstanding(ProposalInfo proposalInfo);
+
+    List<ProposalInfo> jointlyList(ProposalInfo proposalInfo);
+
     AjaxResult zxIdea(ProposalInfo proposalInfo);
+
+    AjaxResult assignsh(ProposalInfo proposalInfo);
 }

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

@@ -5,6 +5,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.CategoryProposal;
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -47,6 +48,7 @@ public class CategoryProposalServiceImpl implements ICategoryProposalService
      * @return 提案类别
      */
     @Override
+    @DataScope(deptAlias = "d")
     public List<CategoryProposal> selectCategoryProposalList(CategoryProposal categoryProposal)
     {
         return categoryProposalMapper.selectCategoryProposalList(categoryProposal);
@@ -117,7 +119,7 @@ public class CategoryProposalServiceImpl implements ICategoryProposalService
     /**
      * 构建前端所需要树结构
      *
-     * @param depts 部门列表
+     * @param
      * @return 树结构列表
      */
     private List<CategoryProposal> buildCategoryTree(List<CategoryProposal> categoryProposals) {

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

@@ -216,10 +216,19 @@ public class ProposalInfoServiceImpl implements IProposalInfoService
     @Transactional
     public AjaxResult assign(ProposalInfo proposalInfo) {
         List<ProposalUnitReply> proposalUnitReplyList = proposalInfo.getProposalUnitReplyList();
-        for (ProposalUnitReply proposalUnitReply : proposalUnitReplyList) {
-            proposalUnitReply.setProposalId(proposalInfo.getProposalId());
-            proposalUnitReplyMapper.insertProposalUnitReply(proposalUnitReply);
+        ProposalUnitReply zbUnitReply = proposalInfo.getZbUnitReply();
+
+        if(proposalUnitReplyList!=null && proposalUnitReplyList.size()>0){
+            for (ProposalUnitReply proposalUnitReply : proposalUnitReplyList) {
+                proposalUnitReply.setType("2");
+                proposalUnitReply.setProposalId(proposalInfo.getProposalId());
+                proposalUnitReplyMapper.insertProposalUnitReply(proposalUnitReply);
+            }
         }
+        zbUnitReply.setProposalId(proposalInfo.getProposalId());
+        zbUnitReply.setType("1");
+        proposalUnitReplyMapper.insertProposalUnitReply(zbUnitReply);
+
         proposalInfo.setProposalProgress("3");
         proposalInfo.setUpdateTime(DateUtils.getNowDate());
         int i = proposalInfoMapper.updateProposalInfo(proposalInfo);
@@ -234,11 +243,40 @@ public class ProposalInfoServiceImpl implements IProposalInfoService
         return i > 0 ? AjaxResult.success() : AjaxResult.error();
     }
 
+    @Override
+    public AjaxResult keyPoint(ProposalInfo proposalInfo) {
+        proposalInfo.setUpdateTime(DateUtils.getNowDate());
+        int i = proposalInfoMapper.updateProposalInfo(proposalInfo);
+        return i > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
+    @Override
+    public AjaxResult outstanding(ProposalInfo proposalInfo) {
+        proposalInfo.setUpdateTime(DateUtils.getNowDate());
+        int i = proposalInfoMapper.updateProposalInfo(proposalInfo);
+        return i > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
+    @Override
+    public List<ProposalInfo> jointlyList(ProposalInfo proposalInfo) {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        proposalInfo.setProposalUserId(user.getUserId());
+        return proposalInfoMapper.selectProposalInfoListByUser(proposalInfo);
+    }
+
     @Override
     public AjaxResult zxIdea(ProposalInfo proposalInfo) {
-        proposalInfo.setProposalProgress("6");
+        proposalInfo.setProposalProgress("5");
+        proposalInfo.setUpdateTime(DateUtils.getNowDate());
+        int i = proposalInfoMapper.updateProposalInfo(proposalInfo);
+        return i > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
+    @Override
+    public AjaxResult assignsh(ProposalInfo proposalInfo) {
         proposalInfo.setUpdateTime(DateUtils.getNowDate());
         int i = proposalInfoMapper.updateProposalInfo(proposalInfo);
         return i > 0 ? AjaxResult.success() : AjaxResult.error();
     }
+
 }

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

@@ -113,6 +113,7 @@ public class ProposalUnitReplyServiceImpl implements IProposalUnitReplyService
         List<ProposalUnitReply> list = proposalUnitReplyMapper.selectProposalUnitReplyList(proposalUnitReply);
         for (ProposalUnitReply unitReply : list) {
             unitReply.setContent(proposalUnitReply.getContent());
+            unitReply.setIsReply("0");
             proposalUnitReplyMapper.updateProposalUnitReply(unitReply);
         }
         if(list.get(0).getType().equals("2")){

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

@@ -34,17 +34,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="uniteProposalId"    column="unite_proposal_id"    />
         <result property="satisfaction"    column="satisfaction"    />
         <result property="membersOpinion"    column="members_opinion"    />
+
+        <result property="cbdwdfwy"    column="cbdwdfwy"    />
+
         <result property="zxSatisfaction"    column="zx_satisfaction"    />
         <result property="zxOpinion"    column="zx_opinion"    />
+
+        <result property="isKeyPoint"    column="is_key_point"    />
+        <result property="keyPointArgument"    column="key_point_argument"    />
+        <result property="isOutstanding"    column="is_outstanding"    />
+        <result property="outstandingArgument"    column="outstanding_argument"    />
+
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+
+
+        <result property="isAgree"    column="isAgree"    />
     </resultMap>
 
     <sql id="selectProposalInfoVo">
-        select proposal_id, proposal_user_id, proposal_number, title, proposal_name, proposal_phone, boundary, party_affiliation, contact_address, category_id, category_name, proposal_type, proposal_content, is_jointly, is_publicity, content_publicity, is_survey, is_first, is_person, is_record, negotiate_type, proposed_contractor, proposal_progress, rolling_process, complex_type, is_cases_together, unite_proposal_id, satisfaction, members_opinion, create_by, create_time, update_by, update_time, remark from proposal_info
+        select proposal_id, proposal_user_id, proposal_number, title, proposal_name, proposal_phone, boundary, party_affiliation, contact_address, category_id, category_name, proposal_type, proposal_content, is_jointly, is_publicity, content_publicity, is_survey, is_first, is_person, is_record, negotiate_type, proposed_contractor, proposal_progress, rolling_process, complex_type, is_cases_together, unite_proposal_id, satisfaction, members_opinion,
+               cbdwdfwy,zx_satisfaction,zx_opinion,is_key_point,key_point_argument,is_outstanding,outstanding_argument,create_by, create_time, update_by, update_time, remark from proposal_info
     </sql>
 
     <select id="selectProposalInfoList" parameterType="ProposalInfo" resultMap="ProposalInfoResult">
@@ -80,6 +93,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="membersOpinion != null  and membersOpinion != ''"> and members_opinion = #{membersOpinion}</if>
             <if test="zxSatisfaction != null  and zxSatisfaction != ''"> and zx_satisfaction = #{zxSatisfaction}</if>
             <if test="zxOpinion != null  and zxOpinion != ''"> and zx_opinion = #{zxOpinion}</if>
+
+            <if test="isKeyPoint != null  and isKeyPoint != ''"> and is_key_point = #{isKeyPoint}</if>
+            <if test="keyPointArgument != null  and keyPointArgument != ''"> and key_point_argument = #{keyPointArgument}</if>
+            <if test="isOutstanding != null  and isOutstanding != ''"> and is_outstanding = #{isOutstanding}</if>
+            <if test="outstandingArgument != null  and outstandingArgument != ''"> and outstanding_argument = #{outstandingArgument}</if>
         </where>
     </select>
     
@@ -87,7 +105,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectProposalInfoVo"/>
         where proposal_id = #{proposalId}
     </select>
-        
+    <select id="selectProposalInfoListByUser" resultMap="ProposalInfoResult">
+        select p.proposal_id, p.proposal_user_id, p.proposal_number, p.title, p.proposal_name, p.proposal_phone, p.boundary, p.party_affiliation,
+               p.contact_address, p.category_id, p.category_name, p.proposal_type, p.proposal_content, p.is_jointly, p.is_publicity, p.content_publicity,
+               p.is_survey, p.is_first, p.is_person, p.is_record, p.negotiate_type, p.proposed_contractor, p.proposal_progress, p.rolling_process, p.complex_type,
+               p.is_cases_together, p.unite_proposal_id, p.satisfaction, p.members_opinion,p.cbdwdfwy,
+               p.zx_satisfaction,p.zx_opinion,p.is_key_point,p.key_point_argument,p.is_outstanding,p.outstanding_argument,p.create_by, p.create_time,
+               p.update_by, p.update_time, p.remark,u.is_agree as isAgree
+        from proposal_info p
+        left join proposal_user u on p.proposal_id = u.proposal_id
+        where u.user_id = #{proposalUserId} and u.type = '2'
+        <if test="isAgree != null  and isAgree != ''"> and u.is_agree = #{isAgree}</if>
+        <if test="proposalNumber != null  and proposalNumber != ''"> and p.proposal_number = #{proposalNumber}</if>
+        <if test="title != null  and title != ''"> and p.title = #{title}</if>
+        <if test="proposalName != null  and proposalName != ''"> and p.proposal_name like concat('%', #{proposalName}, '%')</if>
+        <if test="proposalPhone != null  and proposalPhone != ''"> and p.proposal_phone = #{proposalPhone}</if>
+        <if test="boundary != null  and boundary != ''"> and p.boundary = #{boundary}</if>
+        <if test="partyAffiliation != null  and partyAffiliation != ''"> and p.party_affiliation = #{partyAffiliation}</if>
+        <if test="contactAddress != null  and contactAddress != ''"> and p.contact_address = #{contactAddress}</if>
+        <if test="categoryId != null "> and p.category_id = #{categoryId}</if>
+        <if test="categoryName != null  and categoryName != ''"> and p.category_name like concat('%', #{categoryName}, '%')</if>
+        <if test="proposalType != null  and proposalType != ''"> and p.proposal_type = #{proposalType}</if>
+        <if test="proposalContent != null  and proposalContent != ''"> and p.proposal_content = #{proposalContent}</if>
+        <if test="isJointly != null  and isJointly != ''"> and p.is_jointly = #{isJointly}</if>
+        <if test="isPublicity != null  and isPublicity != ''"> and p.is_publicity = #{isPublicity}</if>
+        <if test="contentPublicity != null  and contentPublicity != ''"> and p.content_publicity = #{contentPublicity}</if>
+        <if test="isSurvey != null  and isSurvey != ''"> and p.is_survey = #{isSurvey}</if>
+        <if test="isFirst != null  and isFirst != ''"> and p.is_first = #{isFirst}</if>
+        <if test="isPerson != null  and isPerson != ''"> and p.is_person = #{isPerson}</if>
+        <if test="isRecord != null  and isRecord != ''"> and p.is_record = #{isRecord}</if>
+        <if test="negotiateType != null  and negotiateType != ''"> and p.negotiate_type = #{negotiateType}</if>
+        <if test="proposedContractor != null  and proposedContractor != ''"> and p.proposed_contractor = #{proposedContractor}</if>
+        <if test="proposalProgress != null  and proposalProgress != ''"> and p.proposal_progress = #{proposalProgress}</if>
+        <if test="rollingProcess != null  and rollingProcess != ''"> and p.rolling_process = #{rollingProcess}</if>
+        <if test="complexType != null  and complexType != ''"> and p.complex_type = #{complexType}</if>
+        <if test="isCasesTogether != null  and isCasesTogether != ''"> and p.is_cases_together = #{isCasesTogether}</if>
+        <if test="uniteProposalId != null "> and p.unite_proposal_id = #{uniteProposalId}</if>
+        <if test="satisfaction != null  and satisfaction != ''"> and p.satisfaction = #{satisfaction}</if>
+        <if test="membersOpinion != null  and membersOpinion != ''"> and p.members_opinion = #{membersOpinion}</if>
+        <if test="zxSatisfaction != null  and zxSatisfaction != ''"> and p.zx_satisfaction = #{zxSatisfaction}</if>
+        <if test="zxOpinion != null  and zxOpinion != ''"> and p.zx_opinion = #{zxOpinion}</if>
+        <if test="isKeyPoint != null  and isKeyPoint != ''"> and p.is_key_point = #{isKeyPoint}</if>
+        <if test="keyPointArgument != null  and keyPointArgument != ''"> and p.key_point_argument = #{keyPointArgument}</if>
+        <if test="isOutstanding != null  and isOutstanding != ''"> and p.is_outstanding = #{isOutstanding}</if>
+        <if test="outstandingArgument != null  and outstandingArgument != ''"> and p.outstanding_argument = #{outstandingArgument}</if>
+        order by p.update_time desc
+    </select>
+
     <insert id="insertProposalInfo" parameterType="ProposalInfo" useGeneratedKeys="true" keyProperty="proposalId">
         insert into proposal_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -119,8 +183,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="uniteProposalId != null">unite_proposal_id,</if>
             <if test="satisfaction != null">satisfaction,</if>
             <if test="membersOpinion != null">members_opinion,</if>
-            <if test="zxSatisfaction != null  "> zx_satisfaction</if>
-            <if test="zxOpinion != null  "> zx_opinion</if>
+            <if test="cbdwdfwy != null  "> cbdwdfwy,</if>
+            <if test="zxSatisfaction != null  "> zx_satisfaction,</if>
+            <if test="zxOpinion != null  "> zx_opinion,</if>
+            <if test="isKeyPoint != null  "> is_key_point,</if>
+            <if test="keyPointArgument != null "> key_point_argument, </if>
+            <if test="isOutstanding != null  "> is_outstanding ,</if>
+            <if test="outstandingArgument != null  "> outstanding_argument, </if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -156,8 +225,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="uniteProposalId != null">#{uniteProposalId},</if>
             <if test="satisfaction != null">#{satisfaction},</if>
             <if test="membersOpinion != null">#{membersOpinion},</if>
-            <if test="zxSatisfaction != null "> #{zxSatisfaction}</if>
-            <if test="zxOpinion != null  ">#{zxOpinion}</if>
+            <if test="cbdwdfwy != null  "> #{cbdwdfwy},</if>
+            <if test="zxSatisfaction != null "> #{zxSatisfaction},</if>
+            <if test="zxOpinion != null  ">#{zxOpinion},</if>
+            <if test="isKeyPoint != null  "> #{isKeyPoint},</if>
+            <if test="keyPointArgument != null  "> #{keyPointArgument},</if>
+            <if test="isOutstanding != null  "> #{isOutstanding},</if>
+            <if test="outstandingArgument != null "> #{outstandingArgument},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -197,8 +271,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="uniteProposalId != null">unite_proposal_id = #{uniteProposalId},</if>
             <if test="satisfaction != null">satisfaction = #{satisfaction},</if>
             <if test="membersOpinion != null">members_opinion = #{membersOpinion},</if>
-            <if test="zxSatisfaction != null "> zx_satisfaction = #{zxSatisfaction}</if>
-            <if test="zxOpinion != null "> zx_opinion = #{zxOpinion}</if>
+            <if test="cbdwdfwy != null  "> cbdwdfwy = #{cbdwdfwy},</if>
+            <if test="zxSatisfaction != null "> zx_satisfaction = #{zxSatisfaction},</if>
+            <if test="zxOpinion != null "> zx_opinion = #{zxOpinion},</if>
+            <if test="isKeyPoint != null ">  is_key_point = #{isKeyPoint},</if>
+            <if test="keyPointArgument != null  ">  key_point_argument = #{keyPointArgument},</if>
+            <if test="isOutstanding != null  ">  is_outstanding = #{isOutstanding},</if>
+            <if test="outstandingArgument != null ">  outstanding_argument = #{outstandingArgument},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>

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

@@ -9,13 +9,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptId"    column="dept_id"    />
         <result property="deptName"    column="dept_name"    />
         <result property="proposalId"    column="proposal_id"    />
+        <result property="isReply"    column="is_reply"    />
         <result property="content"    column="content"    />
         <result property="type"    column="type"    />
         <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectProposalUnitReplyVo">
-        select id, dept_id,dept_name, proposal_id, content, type, remark from proposal_unit_reply
+        select id, dept_id,dept_name, proposal_id,is_reply, content, type, remark from proposal_unit_reply
     </sql>
 
     <select id="selectProposalUnitReplyList" parameterType="ProposalUnitReply" resultMap="ProposalUnitReplyResult">
@@ -25,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="proposalId != null "> and proposal_id = #{proposalId}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="isReply != null  and isReply != ''"> and is_reply = #{isReply}</if>
         </where>
     </select>
     
@@ -39,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id,</if>
             <if test="deptName != null and deptName != ''">dept_name,</if>
             <if test="proposalId != null">proposal_id,</if>
+            <if test="isReply != null  ">is_reply ,</if>
             <if test="content != null and content != ''">content,</if>
             <if test="type != null">type,</if>
             <if test="remark != null">remark,</if>
@@ -47,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">#{deptId},</if>
             <if test="deptName != null and deptName != ''">#{deptName},</if>
             <if test="proposalId != null">#{proposalId},</if>
+            <if test="isReply != null  ">#{isReply},</if>
             <if test="content != null and content != ''">#{content},</if>
             <if test="type != null">#{type},</if>
             <if test="remark != null">#{remark},</if>
@@ -59,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="deptName != null and deptName != ''">dept_name= #{deptName},</if>
             <if test="proposalId != null">proposal_id = #{proposalId},</if>
+            <if test="isReply != null  "> is_reply = #{isReply},</if>
             <if test="content != null and content != ''">content = #{content},</if>
             <if test="type != null">type = #{type},</if>
             <if test="remark != null">remark = #{remark},</if>

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

@@ -6,24 +6,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="ProposalUser" id="ProposalUserResult">
         <result property="id"    column="id"    />
+        <result property="userId"    column="user_id"    />
         <result property="proposalId"    column="proposal_id"    />
         <result property="name"    column="name"    />
         <result property="unit"    column="unit"    />
         <result property="type"    column="type"    />
+        <result property="isAgree"    column="is_agree"    />
         <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectProposalUserVo">
-        select id, proposal_id, name, unit, type, remark from proposal_user
+        select id, user_id, proposal_id, name, unit, type,is_agree, remark from proposal_user
     </sql>
 
     <select id="selectProposalUserList" parameterType="ProposalUser" resultMap="ProposalUserResult">
         <include refid="selectProposalUserVo"/>
-        <where>  
+        <where>
+            <if test="userId != null "> and user_id = #{userId}</if>
             <if test="proposalId != null "> and proposal_id = #{proposalId}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="isAgree != null  and isAgree != ''"> and is_agree = #{isAgree}</if>
         </where>
     </select>
     
@@ -35,17 +39,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertProposalUser" parameterType="ProposalUser" useGeneratedKeys="true" keyProperty="id">
         insert into proposal_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null "> user_id,</if>
             <if test="proposalId != null">proposal_id,</if>
             <if test="name != null and name != ''">name,</if>
             <if test="unit != null and unit != ''">unit,</if>
             <if test="type != null">type,</if>
+            <if test="isAgree != null ">  is_agree ,</if>
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null "> #{userId},</if>
             <if test="proposalId != null">#{proposalId},</if>
             <if test="name != null and name != ''">#{name},</if>
             <if test="unit != null and unit != ''">#{unit},</if>
             <if test="type != null">#{type},</if>
+            <if test="isAgree != null"> #{isAgree},</if>
             <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
@@ -53,10 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateProposalUser" parameterType="ProposalUser">
         update proposal_user
         <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null "> user_id = #{userId},</if>
             <if test="proposalId != null">proposal_id = #{proposalId},</if>
             <if test="name != null and name != ''">name = #{name},</if>
             <if test="unit != null and unit != ''">unit = #{unit},</if>
             <if test="type != null">type = #{type},</if>
+            <if test="isAgree != null "> is_agree = #{isAgree},</if>
             <if test="remark != null">remark = #{remark},</if>
         </trim>
         where id = #{id}