修改归档

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/gwflow/controller/GwFlowController.java

@@ -183,7 +183,13 @@ public class GwFlowController {
 				gwCirculationCard2Service.saveOrUpdate (gwCirculationCard2Wrapper.toEntity (gwCirculationCard2DTO));
 			}
 
-		//2、此时是局领导、或科室领导审核提交的时候
+		//2、Next=0的时候，直接归档
+		}else if(gwFlowDTO.getNext()!=null&&gwFlowDTO.getNext().equals("0")){
+			GwCirculationCard2DTO gwCirculationCard2DTO =gwCirculationCard2Wrapper.toDTO (gwCirculationCard2Service.getById ( gwFlowDTO.getGwId() ));
+			gwCirculationCard2DTO.setState("3");
+			gwCirculationCard2Service.saveOrUpdate (gwCirculationCard2Wrapper.toEntity (gwCirculationCard2DTO));
+
+		//3、此时是局领导、或科室领导审核提交的时候
 		}else{
 			//需要判断会签是否结束，结束的时候需要新增一条到办公室主任的待办
 			int count=gwFlowService.isEnd(gwFlowDTO.getGwId());

jp-console/jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -69,6 +69,14 @@ public class UserController {
         return ResponseEntity.ok ( userDTO );
     }
 
+    @ApiLog("查询用户")
+    @GetMapping("queryByLoginName")
+    @ApiOperation(value = "查询用户")
+    public ResponseEntity queryByLoginName(@RequestParam("id") String id) {
+        UserDTO userDTO = userService.getByLoginName ( id );
+        return ResponseEntity.ok ( userDTO );
+    }
+
     /**
      * 查询列表
      *

jp-console/jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -58,6 +58,13 @@ public class UserService extends ServiceImpl <UserMapper, User> {
         return baseMapper.get ( queryWrapper );
     }
 
+    public UserDTO getByLoginName(String id) {
+        QueryWrapper queryWrapper = new QueryWrapper ( );
+        queryWrapper.eq ( "a.login_name", id );
+        queryWrapper.eq ( "a.del_flag", CommonConstants.NOT_DELETED ); // 排除已经删除
+        return baseMapper.get ( queryWrapper );
+    }
+
     /**
      * 根据登录名获取用户
      *

jp-ui/src/api/sys/userService.js

@@ -42,6 +42,15 @@ export default {
 			params: { id: id },
 		});
 	},
+	
+	queryByLoginName: function (id) {
+		return request({
+			url: "/sys/user/queryByLoginName",
+			method: "get",
+			params: { id: id },
+		});
+	},
+	
 
 	getMenus: function () {
 		return request({

jp-ui/src/views/circulation2/GwCirculationCard2Form.vue

@@ -80,27 +80,27 @@
 	            <image-upload v-model="inputForm.attachedDocumentId" :limit="3" tip="最多上传3个图片,单个图片不要超过10M"></image-upload>
            </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
             <el-form-item label="备注" prop="remark"
                 :rules="[
                  ]">
-          <el-input type="textarea" v-model="inputForm.remark" placeholder="请填写备注"     ></el-input>
+          <el-input type="textarea" v-model="inputForm.remark" placeholder="请填写备注" readonly    ></el-input>
            </el-form-item>
-        </el-col>
-        <el-col :span="12">
+        </el-col> -->
+        <!-- <el-col :span="12">
             <el-form-item label="状态" prop="state"
                 :rules="[
                  ]">
-                <el-select v-model="inputForm.state" placeholder="请选择"  style="width: 100%;">
-                          <el-option
-                            v-for="item in $dictUtils.getDictList('gw_state')"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                          </el-option>
-                      </el-select>
+                <el-select v-model="inputForm.state" placeholder="请选择"  style="width: 100%;" readonly>
+				  <el-option
+					v-for="item in $dictUtils.getDictList('gw_state')"
+					:key="item.value"
+					:label="item.label"
+					:value="item.value">
+				  </el-option>
+                </el-select>
            </el-form-item>
-        </el-col>
+        </el-col> -->
         </el-row>
     </el-form>
     <template #footer>