Explorar o código

供需管理系统-服务开发管理-服务开发需求接单:
列表页未展示任务金额及需求用户

mydq %!s(int64=5) %!d(string=hai) anos
pai
achega
72d9dd1fd5

+ 19 - 0
src/main/java/com/lightinit/hsdataplatform/entity/Requirement.java

@@ -1,5 +1,6 @@
 package com.lightinit.hsdataplatform.entity;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 public class Requirement {
@@ -39,6 +40,24 @@ public class Requirement {
     private Date deletedAt;
 
     private Long deletedBy;
+    private BigDecimal money;
+    private String username;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public BigDecimal getMoney() {
+        return money;
+    }
+
+    public void setMoney(BigDecimal money) {
+        this.money = money;
+    }
 
     public Long getRqrmntId() {
         return rqrmntId;

+ 2 - 0
src/main/java/com/lightinit/hsdataplatform/impl/admin/RequirementServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -131,6 +132,7 @@ public class RequirementServiceImpl implements IRequirementService {
 
         BeanUtils.copyProperties(inputModel,entity1);
         entity1.setId(entity.getId());
+        entity1.setMoney(new BigDecimal(inputModel.getMoney()));
         int sqlResult2 =requirementMicroappMapper.insert(entity1);
         if(!(sqlResult1>0 && sqlResult2>0)){
             resultState.setStateCode(ResultStateCode.INVALID_DATA);

+ 7 - 1
src/main/resources/sqlmaps/RequirementMapper.xml

@@ -417,9 +417,10 @@
     <if test="requirementName != null and requirementName.length() &gt; 0">
       <bind name="requirementName" value="'%' + _parameter.requirementName + '%'" />
     </if>
-      SELECT r.id AS rqrmnt_id,r.rqrmnt_name,r.rqrmnt_summary,r.publish_at,r.created_at,r.rqrmnt_state,r.platform_type,r.rqrmnt_type,r.rqrmnt_source
+      SELECT r.id AS rqrmnt_id,r.rqrmnt_name,r.rqrmnt_summary,r.publish_at,r.created_at,r.rqrmnt_state,r.platform_type,r.rqrmnt_type,r.rqrmnt_source, ad.username, rm.money
     FROM requirement r
       INNER JOIN requirement_microapp rm ON r.id=rm.id
+      left join admin ad on r.publish_by = ad.id
     <where>
       <if test="requirementType != null and requirementType.length() &gt; 0">
         AND r.rqrmnt_type = #{requirementType}
@@ -477,6 +478,11 @@
     LEFT JOIN resource_catelog rc ON rc.id=rm.category_id
     LEFT JOIN USER u ON u.id=r.publish_by
     LEFT JOIN admin a ON a.id=r.audited_by
+    FROM requirement r
+    INNER JOIN requirement_microapp rm ON r.id=rm.id
+    LEFT JOIN resource_catelog rc ON rc.id=rm.category_id
+    LEFT JOIN USER u ON u.id=r.publish_by
+    LEFT JOIN admin a ON a.id=r.audited_by
     <where>
       <if test="rqrmntId !=null" >
          r.id=#{rqrmntId}

+ 6 - 2
src/main/webapp/pages/admin/microapp/list.jsp

@@ -10,7 +10,9 @@
         <thead>
         <tr>
             <th>需求名称</th>
-            <th>需求来源</th>
+<%--            <th>需求来源</th>--%>
+            <th>需求用户</th>
+            <th>金额</th>
             <th>需求类型</th>
             <th>需求摘要</th>
             <th>发布日期</th>
@@ -24,7 +26,9 @@
                 <c:forEach items="${list}" var="item" >
                     <tr>
                         <td><a href="javascript:void(0)" onclick="showItem(${item.rqrmntId})">${item.rqrmntName}</a> </td>
-                        <td>${item.rqrmntSource}</td>
+<%--                        <td>${item.rqrmntSource}</td>--%>
+                        <td>${item.username}</td>
+                        <td>${item.money}</td>
                         <td>${item.rqrmntType}</td>
                         <td>${item.rqrmntSummary}</td>
                         <td><fmt:formatDate value="${item.createdAt}" pattern="yyyy-MM-dd"/></td>