品牌项目、分包合同数据更新

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBrandProjectController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.oa;
 
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -95,6 +96,8 @@ public class CmcBrandProjectController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcBrandProject cmcBrandProject)
     {
+        cmcBrandProject.setProjectRegistrant(getLoginUser().getUserId());
+        cmcBrandProject.setRegisterTime(new Date());
         return toAjax(cmcBrandProjectService.updateCmcBrandProject(cmcBrandProject));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcPartyAController.java

@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.oa.domain.CmcPartner;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -72,6 +74,7 @@ public class CmcPartyAController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcPartyA cmcPartyA)
     {
+        cmcPartyA.setPartyAId(String.valueOf(cmcPartyAService.selectCmcPartyAList(new CmcPartyA()).size() + 1));
         return toAjax(cmcPartyAService.insertCmcPartyA(cmcPartyA));
     }
 

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBrandProject.java

@@ -1,6 +1,9 @@
 package com.ruoyi.oa.domain;
 
 import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -67,6 +70,15 @@ public class CmcBrandProject extends BaseEntity
     @Excel(name = "项目概况")
     private String content;
 
+    /** 项目登记人 */
+    @Excel(name = "项目登记人")
+    private Long projectRegistrant;
+
+    /** 项目登记日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "项目登记日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date registerTime;
+
     public void setProjectId(String projectId) 
     {
         this.projectId = projectId;
@@ -193,6 +205,24 @@ public class CmcBrandProject extends BaseEntity
     {
         return content;
     }
+    public void setProjectRegistrant(Long projectRegistrant)
+    {
+        this.projectRegistrant = projectRegistrant;
+    }
+
+    public Long getProjectRegistrant()
+    {
+        return projectRegistrant;
+    }
+    public void setRegisterTime(Date registerTime)
+    {
+        this.registerTime = registerTime;
+    }
+
+    public Date getRegisterTime()
+    {
+        return registerTime;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBrandProjectMapper.xml

@@ -18,6 +18,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="amount"    column="amount"    />
         <result property="content"    column="content"    />
         <result property="remark"    column="remark"    />
+        <result property="projectRegistrant"    column="project_registrant"    />
+        <result property="registerTime"    column="register_time"    />
         <association property="partner"    javaType="CmcPartner"         resultMap="CmcPartnerResult" />
         <association property="partyA"    javaType="CmcPartyA"         resultMap="CmcPartyAResult" />
     </resultMap>
@@ -33,7 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcBrandProjectVo">
-        select bp.project_id, bp.project_number, bp.project_name, bp.party_a_id, pa.party_a_name, bp.a_person, bp.a_phone, bp.partner_id, p.partner_name, bp.contact_person, bp.telephone, bp.duration, bp.amount, bp.content, bp.remark from cmc_brand_project as bp
+        select bp.project_id, bp.project_number, bp.project_name, bp.party_a_id, pa.party_a_name, bp.a_person, bp.a_phone, bp.partner_id, p.partner_name, bp.contact_person, bp.telephone,
+               bp.duration, bp.amount, bp.content, bp.remark, bp.register_time, bp.project_registrant from cmc_brand_project as bp
         left join cmc_partner as p on p.partner_id = bp.partner_id
         left join cmc_party_a as pa on pa.party_a_id = bp.party_a_id
     </sql>
@@ -52,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="duration != null  and duration != ''"> and bp.duration = #{duration}</if>
             <if test="amount != null "> and bp.amount = #{amount}</if>
         </where>
+        order by project_number desc
     </select>
     
     <select id="selectCmcBrandProjectByProjectId" parameterType="String" resultMap="CmcBrandProjectResult">
@@ -75,6 +79,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="amount != null">amount,</if>
             <if test="content != null">content,</if>
             <if test="remark != null">remark,</if>
+            <if test="projectRegistrant != null">project_registrant,</if>
+            <if test="registerTime != null">register_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
@@ -90,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="amount != null">#{amount},</if>
             <if test="content != null">#{content},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="projectRegistrant != null">#{projectRegistrant},</if>
+            <if test="registerTime != null">#{registerTime},</if>
          </trim>
     </insert>
 
@@ -108,6 +116,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="amount != null">amount = #{amount},</if>
             <if test="content != null">content = #{content},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="projectRegistrant != null">project_registrant = #{projectRegistrant},</if>
+            <if test="registerTime != null">register_time = #{registerTime},</if>
         </trim>
         where project_id = #{projectId}
     </update>