bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmToDoController.java

@@ -10,14 +10,12 @@ import com.bonus.common.log.enums.OperaType;
 import com.bonus.common.security.annotation.InnerAuth;
 import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 import static com.bonus.bmw.utils.OwnPermissionUtil.dealWithPermission;
 
@@ -47,21 +45,10 @@ public class PmToDoController  extends BaseController {
             Map<String,String> map = dealWithPermission();
             if(!map.isEmpty()){
                 // 3. 将 map 中的值复制到 o 对象中
-                BeanUtils.populate(o, map);
+                org.apache.commons.beanutils.BeanUtils.populate(o, map);
             }
             startPage();
             List<PmToDoVo> list = service.selectTodoList(o);
-            if(Objects.equals(o.getType(), "2")){
-                //查询合同修改的，看到就是已读，将其改成已读
-                StringBuilder ids = new StringBuilder();
-                for (int i = 0; i < list.size(); i++) {
-                    if("0".equals(list.get(i).getStatus())){
-                        ids.append(list.get(i).getId()).append(",");
-                    }
-                }
-                o.setIds(ids.toString());
-                service.updateTodoStatus(o);
-            }
             return getDataTable(list);
         } catch (Exception e) {
             log.error(e.toString(), e);
@@ -78,10 +65,10 @@ public class PmToDoController  extends BaseController {
             //TODO 如果是总公司人员，不给提示直接返回0
             if(!map.isEmpty()){
                 // 3. 将 map 中的值复制到 o 对象中
-                BeanUtils.populate(o, map);
+                org.apache.commons.beanutils.BeanUtils.populate(o, map);
             }
             int m = service.getToDoNum(o);
-            return AjaxResult.success(m);
+            return toAjax(m);
         } catch (Exception e) {
             logger.error(e.toString(), e);
         }

bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerContractMapper.xml

@@ -10,12 +10,17 @@
     <result column="contract_stop_date" property="contractStopDate" />
     <result column="wage_approved_way" property="wageApprovedWay" />
     <result column="wage_criterion" property="wageCriterion" />
+    <result column="day_rate" property="dayRate" />
     <result column="contract_upload_date" property="contractUploadDate" />
     <result column="contract_invalid_date" property="contractInvalidDate" />
+    <result column="create_user" property="createUser" />
+    <result column="update_user" property="updateUser" />
     <result column="pro_name" property="proName" />
     <result column="team_name" property="teamName" />
     <result column="sub_name" property="subName" />
     <result column="pro_Id" property="proId" />
+    <result column="team_id" property="teamId" />
+    <result column="sub_id" property="subId" />
     <result column="name" property="name" />
     <result column="id_number" property="idNumber" />
     <result column="isSign" property="isSign" />

bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml

@@ -440,7 +440,7 @@
     </if>
     GROUP BY
       pw.id,bwem.pro_id
-    order by contractFile
+    order by contractFile ASC
 
     </select>
 </mapper>