提案重点、优秀

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

@@ -139,14 +139,27 @@ public class ProposalInfoController extends BaseController
     }
 
     /***
-     * 是否办结
+     * 推荐重点
      */
-    @PreAuthorize("@ss.hasPermi('proposalInfo:info:zxIdea')")
+    @PreAuthorize("@ss.hasPermi('proposalInfo:info:keyPoint')")
     @Log(title = "提案信息", businessType = BusinessType.UPDATE)
-    @PostMapping("/zxIdea")
-    public AjaxResult zxIdea(@RequestBody ProposalInfo proposalInfo)
+    @PostMapping("/keyPoint")
+    public AjaxResult keyPoint(@RequestBody ProposalInfo proposalInfo)
     {
-        return proposalInfoService.zxIdea(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-system/src/main/java/com/ruoyi/system/domain/ProposalInfo.java

@@ -140,6 +140,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 +164,39 @@ public class ProposalInfo extends BaseEntity
     /** 单位回复 */
     private List<ProposalUnitReply> proposalUnitReplyList;
 
+
+    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;
     }
@@ -452,41 +502,42 @@ public class ProposalInfo extends BaseEntity
 
     @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/service/IProposalInfoService.java

@@ -67,5 +67,7 @@ public interface IProposalInfoService
 
     AjaxResult idea(ProposalInfo proposalInfo);
 
-    AjaxResult zxIdea(ProposalInfo proposalInfo);
+    AjaxResult keyPoint(ProposalInfo proposalInfo);
+
+    AjaxResult outstanding(ProposalInfo proposalInfo);
 }

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

@@ -235,10 +235,17 @@ public class ProposalInfoServiceImpl implements IProposalInfoService
     }
 
     @Override
-    public AjaxResult zxIdea(ProposalInfo proposalInfo) {
-        proposalInfo.setProposalProgress("6");
+    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();
+    }
+
 }

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

@@ -36,6 +36,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="membersOpinion"    column="members_opinion"    />
         <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"    />
@@ -44,7 +50,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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,
+               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 +87,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>
     
@@ -119,8 +131,12 @@ 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="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 +172,12 @@ 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="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 +217,12 @@ 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="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>