Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-business/src/main/java/com/zjugis/business/flow/intern/event/InternEvent.java

@@ -9,6 +9,7 @@ import com.zjugis.framework.workflow.model.BaseController;
 import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
 import com.zjugis.framework.workflow.spring.resovler.ParamModel;
 import com.zjugis.module.adm.api.staff.StaffApi;
+import com.zjugis.module.adm.api.staff.dto.StaffStateDTO;
 import com.zjugis.module.system.api.dept.DeptApi;
 import com.zjugis.module.system.api.dept.DeptLeaderApi;
 import com.zjugis.module.system.api.dept.dto.DeptLeaderRespDTO;
@@ -98,6 +99,13 @@ public class InternEvent extends BaseController {
                 entity.setFlowFinishtime(LocalDateTime.now());
                 entity.setReport("0");
                 internService.update(entity);
+                //归档后把员工状态改为试用
+                StaffStateDTO dto=new StaffStateDTO();
+                dto.setUserId(entity.getUserId());
+                dto.setNickname(entity.getNickname());
+                dto.setState(2);
+                staffApi.updateStaffState(dto);
+
                 return ok("true");
             } else {
                 throw new BusinessException("执行事件出错，请联系管理员！");

zjugis-business/src/main/java/com/zjugis/business/flow/travelcost/dao/TravelCostOtherDao.java

@@ -15,6 +15,6 @@ import java.util.List;
 @Mapper
 public interface TravelCostOtherDao extends BaseMapperX<TravelCostOtherDO> {
     default List<TravelCostOtherDO> getListByTravelCostId(String travelCostId) {
-        return selectList(new LambdaQueryWrapperX<TravelCostOtherDO>().eqIfPresent(TravelCostOtherDO::getTravelCostId, travelCostId));
+        return selectList(new LambdaQueryWrapperX<TravelCostOtherDO>().eqIfPresent(TravelCostOtherDO::getTravelCostId, travelCostId).orderByAsc(TravelCostOtherDO::getIndexCode));
     }
 }

zjugis-business/src/main/java/com/zjugis/business/service/impl/ContractServiceImpl.java

@@ -385,7 +385,7 @@ public class ContractServiceImpl implements ContractService{
             }
             for (ManagePersonDto newDto : newDtos) {
                 if(newDto.getUserId().equals(manageDto.getUserId())){
-                    manageDto.setNewAmount(newDto.getSignAmount());
+                    manageDto.setNewAmount(newDto.getNewAmount());
                 }
             }
         }

zjugis-business/src/main/resources/templates/TravelCost/index.ftl

@@ -302,17 +302,17 @@
         <div class="qjsjxx-box">
           <table id="boatCarTable" class="form-table-info">
             <tr style="height: 37px;">
-              <td class="operation_head_td" style="width: 4%;"></td>
-              <td style="width: 4%;">序号</td>
-              <td style="width: 9%;">出发日期</td>
-              <td style="width: 10%;">出发地点</td>
-              <td style="width: 9%;">到达日期</td>
-              <td style="width: 10%;">到达地点</td>
+              <td class="operation_head_td" style="width: 8%;"></td>
+              <td style="width: 6%;">序号</td>
+              <td style="width: 12%;">出发日期</td>
+              <td style="width: 8%;">出发地点</td>
+              <td style="width: 12%;">到达日期</td>
+              <td style="width: 8%;">到达地点</td>
               <td style="width: 8%;">交通工具</td>
-              <td style="width: 7%;">单据张数</td>
-              <td style="width: 10%;">车船费</td>
-              <td style="width: 13%;">备注</td>
-              <td style="width: 12%;">操作</td>
+              <td style="width: 8%;">单据张数</td>
+              <td style="width: 8%;">车船费</td>
+              <td style="width: 14%;">备注</td>
+              <td style="width: 8%;">操作</td>
             </tr>
             <tbody id="boatCarTbody" class="tbody tbodyQjsq">
             </tbody>
@@ -467,17 +467,17 @@
         background-size: 100% 100%;
     }
     .up_btn {
-        background-image: url("/imgs/up_icon.png");
+        background-image: url("/business/imgs/up_icon.png");
     }
     .down_btn {
-        background-image: url("/imgs/down_icon.png");
+        background-image: url("/business/imgs/down_icon.png");
     }
     .qjsjClass:first-child .up_btn {
-        background-image: url("/imgs/up_disabled_icon.png");
+        background-image: url("/business/imgs/up_disabled_icon.png");
 
     }
     .qjsjClass:last-child .down_btn {
-        background-image: url("/imgs/down_disabled_icon.png");
+        background-image: url("/business/imgs/down_disabled_icon.png");
     }
   </style>
 </@w.workFlow>

zjugis-business/src/main/resources/templates/TravelCost/js/index.js

@@ -164,7 +164,9 @@
         trDom.id = "boat_car_" + i;
         trDom.className = 'qjsjClass'
         trDom.innerHTML = '<td class="operation_icon"><span class="up_btn"></span><span class="down_btn"></span></td>'
-            + '<td name="boat_car_seq">' + (i + 1) + '</td>'
+            + '<td name="boat_car_seq">' + (i + 1)
+            + '<input type="hidden" name="TravelCostBoatCarDO[' + i + ']$indexCode" value="'+ (i + 1) +'">'
+            + '</td>'
             + '<td>'
             + '<div class="form-flex">'
             + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
@@ -386,6 +388,8 @@
         })
         if (viewState === 'v' || (read === '1' && finance != '1')) {
             detailReadonly(i, true, 'boat_car')
+            $(".operation_head_td").css("display", "none")
+            $("#boatCarTbody>tr").find('.operation_icon').css("display", "none")
         }
     }
 
@@ -579,8 +583,6 @@
                 $("#delBtn_boat_car_" + i).css("display", "none");
             }
         }
-        $(".operation_head_td").css("display", "none")
-        $("#boatCarTbody>tr").find('.operation_icon').css("display", "none")
         let detailElement = document.getElementById(detailType + "_" + i);
         let detailInput = detailElement.getElementsByTagName("input");
         for (let j = 0; j < detailInput.length; j++) {