wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
DirectionOfMind 2021-01-25 11:06:45 +08:00
parent 318b7433eb
commit d08eeb181d
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/modules/app/controller/ThirdTaskController.java
View File

@ -25,10 +25,12 @@ import com.lz.modules.third.utils.TaskConvertUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.crypto.hash.Sha256Hash; import org.apache.shiro.crypto.hash.Sha256Hash;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;

2
src/main/resources/mapper/app/ResultDetailMapper.xml
View File

@ -217,7 +217,7 @@
</select> </select>
<select id="listRecord" resultType="com.lz.modules.app.dto.ResultDto"> <select id="listRecord" resultType="com.lz.modules.app.dto.ResultDto">
SELECT @rownum:=@rownum+1 as 'index',b.* from (select @rownum:=0) a,( SELECT @rownum:=@rownum+1 as 'index',b.id,b.target content,b.process_rate rate from (select @rownum:=0) a,(
SELECT d.id,d.target,process_rate from lz_result_record r LEFT JOIN lz_result_detail d SELECT d.id,d.target,process_rate from lz_result_record r LEFT JOIN lz_result_detail d
on r.id = d.record_id on r.id = d.record_id
where r.is_delete = 0 and d.is_delete=0 and d.staff_id = #{staffId} where r.is_delete = 0 and d.is_delete=0 and d.staff_id = #{staffId}

2
src/main/resources/mapper/performance/ResultTaskMapper.xml
View File

@ -103,7 +103,7 @@
<select id="listResultTask" resultType="com.lz.modules.app.dto.ResultDto"> <select id="listResultTask" resultType="com.lz.modules.app.dto.ResultDto">
select @rownum:=@rownum+1 as 'index',id,name content,process_rate rate from (select @rownum:=0) a, lz_result_task where is_delete=0 select @rownum:=@rownum+1 as 'index',id,name content,process_rate rate from (select @rownum:=0) a, lz_result_task where is_delete=0
<if test="detailIds !=null and detailIds!=''"> <if test="detailIds !=null">
and detail_id in and detail_id in
<foreach item="detailId" collection="detailIds" open="(" separator="," close=")"> <foreach item="detailId" collection="detailIds" open="(" separator="," close=")">
#{detailId} #{detailId}