فهرست منبع

fix on 2020.11.30

jiequan.bi 4 سال پیش
والد
کامیت
037bae19a2

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/PlatformMaterialMapper.java

@@ -18,6 +18,9 @@ public interface PlatformMaterialMapper extends BaseMapper<PlatformMaterial> {
 
     List<JSONObject> queryMaterialsByDesignUserId(@Param("materialStatus") JSONArray materialStatus, @Param("designUserId") String designUserId);
 
+    //带指派的物料
+    List<JSONObject> queryMaterialsByDesignLeader(@Param("materialStatus") JSONArray materialStatus, @Param("designLeader") String designLeader);
+
     List<JSONObject> queryMaterialsByOperatorUserId(@Param("operatorUserId") String designUserId);
 
     JSONObject queryScriptDetailById(@Param("scriptId") String scriptId);

+ 42 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/xml/PlatformMaterialMapper.xml

@@ -46,6 +46,48 @@
            OR shot = #{designUserId})
     </select>
 
+    <select id="queryMaterialsByDesignLeader" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+        t2.id as orderId,
+        t2.order_title as orderTitle,
+        (SELECT realname from sys_user where id=t2.create_by) as createBy,
+        (SELECT realname from sys_user where id=t2.design) as designLeader,
+        t2.start_date as startDate,
+        t2.end_date as endDate,
+        t2.attachment_url as attachmentUrl,
+        t2.attachment_name as attachmentName,
+        t2.order_remark as orderRemark,
+        (SELECT project_name from ctop_project where id=t1.project_id) as projectName,
+        t1.id as materialId,
+        t1.project_id as projectId,
+        t1.material_code as materialCode,
+        t1.material_name as materialName,
+        t1.material_type as materialType,
+        t1.material_status as materialStatus,
+        t1.script_id as scriptId,
+        t1.script_status  as scriptStatus,
+        t1.script_advise as scriptAdvise,
+        t1.video_id as videoId,
+        t1.video_status as videoStatus,
+        t1.video_advise as videoAdvise,
+        t1.shot,
+        (SELECT realname from sys_user where id=t1.shot) as shotName,
+        t1.clip,
+        (SELECT realname from sys_user where id=t1.clip) as clipName,
+        t1.plan,
+        (SELECT realname from sys_user where id=t1.plan) as planName
+        FROM
+        ctop_platform_material t1
+        LEFT JOIN ctop_platform_order t2 ON t1.order_code = t2.order_code
+        WHERE
+        t1.material_status in
+        <foreach item="item" index="index" collection="materialStatus"
+                 open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        And t2.design=#{designLeader}
+    </select>
+
     <select id="queryMaterialsByOperatorUserId" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
             t2.id as orderId,

+ 8 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/impl/PlatformMaterialServiceImpl.java

@@ -12,6 +12,7 @@ import org.jeecg.modules.orderplatform.util.JsonArrayUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -29,7 +30,13 @@ public class PlatformMaterialServiceImpl extends ServiceImpl<PlatformMaterialMap
     @Override
     public List<JSONObject> queryMaterialsByDesignUserId(String materialStatus, String designUserId) {
         JSONArray materialStatusJsonArray = JsonArrayUtil.Varchar2JSONArray(materialStatus);
-        return platformMaterialMapper.queryMaterialsByDesignUserId(materialStatusJsonArray, designUserId);
+        List<JSONObject> result=new ArrayList<>();
+        if(materialStatus.equals("0")){
+            result=platformMaterialMapper.queryMaterialsByDesignLeader(materialStatusJsonArray,designUserId);
+        }else {
+            result=platformMaterialMapper.queryMaterialsByDesignUserId(materialStatusJsonArray, designUserId);
+        }
+        return result;
     }
 
     @Override