任务 8612 任务 8695

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/SignMapper.xml

@@ -18,7 +18,7 @@
         cb_sign sign
         <where>
             <if test="dto.name!=null and dto.name!=''">
-                and sign.`name`=#{dto.name}
+                and sign.`name`= like CONCAT(#{dto.name},'%')
             </if>
             <if test="dto.type!=null and dto.type!=''">
                 and sign.type=#{dto.type})
@@ -32,6 +32,9 @@
             <if test="dto.bizOrgCode!=null and dto.bizOrgCode!=''">
                 and sign.biz_org_code like CONCAT(#{dto.bizOrgCode},'%')
             </if>
+            <if test="dto.date!=null and dto.date!=''">
+                and sign.date= #{dto.date}
+            </if>
         </where>
         order by sign.rec_date desc
     </select>
@@ -39,7 +42,7 @@
 
         SELECT
             date,
-            count(name) signNum,
+            count(sequence_nbr) signNum,
             biz_org_name bizOrgName,
             biz_org_code bizOrgCode
         FROM

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/SignServiceImpl.java

@@ -49,8 +49,15 @@ public class SignServiceImpl extends BaseService<SignDto,Sign,SignMapper> implem
 
         sinStaticDtoIPage.getRecords().stream().forEach(e->{
             int num = this.baseMapper.queryPersonNum(e.getBizOrgCode());
+            int signNum ;
+            if((Integer.parseInt(e.getSignNum()) & 1) != 0) {
+                signNum =  (Integer.parseInt(e.getSignNum()) + 1) / 2;
+            } else {
+                signNum = (Integer.parseInt(e.getSignNum())) / 2;
+            }
+
             if(num != 0) {
-                e.setAttendance(numberFormat.format((float)Integer.parseInt(e.getSignNum())/(float) num * 100) + "%");
+                e.setAttendance(numberFormat.format((float) Integer.valueOf(signNum)/(float) num * 100) + "%");
             }  else {
                 e.setAttendance("0%");
             }