修改

jp-console/.idea/compiler.xml

@@ -20,6 +20,7 @@
         <module name="jeeplus-web" />
         <module name="jeeplus-datascreen" />
         <module name="jeeplus-datasource" />
+        <module name="gw" />
         <module name="jeeplus-wps" />
         <module name="jeeplus-admin" />
         <module name="jeeplus-flowable" />
@@ -31,10 +32,16 @@
         <module name="jeeplus-echarts" />
         <module name="jeeplus-form" />
       </profile>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+      </profile>
     </annotationProcessing>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="gw" options="-parameters" />
       <module name="jeeplus-admin" options="-parameters" />
       <module name="jeeplus-calendar" options="-parameters" />
       <module name="jeeplus-common" options="-parameters" />
@@ -48,13 +55,14 @@
       <module name="jeeplus-modules" options="" />
       <module name="jeeplus-monitor" options="-parameters" />
       <module name="jeeplus-notify" options="-parameters" />
-      <module name="jeeplus-plugins" options="-parameters" />
+      <module name="jeeplus-plugins" options="" />
       <module name="jeeplus-quartz" options="-parameters" />
       <module name="jeeplus-test" options="-parameters" />
       <module name="jeeplus-tools" options="-parameters" />
       <module name="jeeplus-ureport" options="-parameters" />
       <module name="jeeplus-web" options="-parameters" />
       <module name="jeeplus-wps" options="-parameters" />
+      <module name="jp-console" options="" />
     </option>
   </component>
 </project>

jp-console/.idea/encodings.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/jeeplus-modules/gw/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jeeplus-modules/gw/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jeeplus-modules/gw/src/main/webapp" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/jeeplus-modules/jeeplus-test/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/jeeplus-modules/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/jeeplus-platform/jeeplus-admin/src/main/java" charset="UTF-8" />

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/circulation2/controller/GwCirculationCard2Controller.java

@@ -108,14 +108,22 @@ public class GwCirculationCard2Controller {
 			queryWrapper.eq ("a.del_flag", 0 ); // 排除已经删除
 			queryWrapper.eq ("b.del_flag", 0 ); // 排除已经删除
 
-			if(!isadmin){
-				queryWrapper.eq ("b.update_by_id", userDTO.getId() );
-			}
-
+			//状态：1待办，2暂存，3归档，4已办，
+			//5查看所有
 			if(state!=null&&!state.equals("null")&&!state.equals("")){
-				queryWrapper.eq ("a.state", state );
+
+				//1待办
+				if(state.equals("1")){
+					queryWrapper.eq ("b.state", "1" );
+				}
+				//4已办,根据流程上来
 				if(state.equals("4")){
-					queryWrapper.ne ("b.state", "1" );
+					queryWrapper.eq ("b.state", "0" );
+				}else if(!state.equals("5")){//除已办其他状态需要筛选公文表
+					queryWrapper.eq ("a.state", state );
+				}
+				if(!state.equals("5")){
+					queryWrapper.eq ("b.update_by_id", userDTO.getId() );
 				}
 			}
 			queryWrapper.groupBy("a.id");
@@ -138,6 +146,15 @@ public class GwCirculationCard2Controller {
 		return ResponseEntity.ok ( gwCirculationCard2Service.getStatistics ( userDTO.getId() )  );
 	}
 
+	/**
+	 * 获取最新卡号
+	 */
+	@ApiLog("获取最新卡号")
+	@ApiOperation(value = "获取最新卡号")
+	@GetMapping("getCardNum")
+	public ResponseEntity<String> getCardNum() {
+		return ResponseEntity.ok ( gwCirculationCard2Service.getCardNum (  )  );
+	}
 
 	/**
 	 * 根据Id获取公文流转数据

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/circulation2/mapper/GwCirculationCard2Mapper.java

@@ -28,4 +28,5 @@ public interface GwCirculationCard2Mapper extends BaseMapper<GwCirculationCard2>
     HashMap<String, Object> getStatistics(String userid);
     int getStatistics2(String userid);
     int getStatistics3(String userid);
+    String getCardNum();
 }

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/circulation2/mapper/xml/GwCirculationCard2Mapper.xml

@@ -49,8 +49,8 @@
     </select>
 
     <select id="getStatistics" resultType="java.util.HashMap">
-        SELECT sum(if (a.del_flag=0,1,0)) allcount,
-               sum(if (a.state=3,1,0)) gdcount
+        SELECT IFNULL(sum(if (a.del_flag=0,1,0)),0) allcount,
+               IFNULL(sum(if (a.state=3,1,0)),0) gdcount
         From (SELECT * FROM gw_circulation_card2 ) a
 
     </select>
@@ -67,4 +67,9 @@
         where a.del_flag=0 and b.state=0 and b.next_user=#{userid}
     </select>
 
+    <select id="getCardNum" resultType="String">
+        SELECT card_num FROM gw_circulation_card2 where del_flag=0 order by create_time desc LIMIT 1
+    </select>
+
+
 </mapper>

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/circulation2/service/GwCirculationCard2Service.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.circulation2.service.dto.GwCirculationCard2DTO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -46,7 +47,18 @@ public class GwCirculationCard2Service extends ServiceImpl<GwCirculationCard2Map
         int a1=baseMapper.getStatistics2(userid);
         int a2=baseMapper.getStatistics3(userid);
         aa.put("db",a1);
-        aa.put("yb",a1);
+        aa.put("yb",a2);
         return aa;
     }
+
+    public String getCardNum() {
+        String aa=baseMapper.getCardNum();
+        String bb="1";
+        if(aa!=null&&StringUtils.isNumeric(aa)){
+            int aas=Integer.parseInt(aa)+1;
+            bb=aas+"";
+        }
+        return bb;
+    }
+
 }

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

@@ -131,7 +131,9 @@ public class GwFlowController {
 //			gwFlowService.saveOrUpdate (gwFlowWrapper.toEntity (a1));
 //		}
 
-		//此时是办公室主任选人后的操作
+
+		//根据Next判断此时是哪一类人员提交
+		//1、此时是办公室主任选人后的操作
 		if(gwFlowDTO.getNext()!=null&&gwFlowDTO.getNext().equals("1")){
 
 			//有选择领导的时候新增
@@ -154,7 +156,6 @@ public class GwFlowController {
 				}
 			}
 
-
 			//有选择科室承办的时候新增
 			if(gwFlowDTO.getNextDepUser()!=null) {
 				String [] NextDepUsers=gwFlowDTO.getNextDepUser().split(",");
@@ -182,6 +183,23 @@ public class GwFlowController {
 				gwCirculationCard2Service.saveOrUpdate (gwCirculationCard2Wrapper.toEntity (gwCirculationCard2DTO));
 			}
 
+		//2、此时是局领导、或科室领导审核提交的时候
+		}else{
+			//需要判断会签是否结束，结束的时候需要新增一条到办公室主任的待办
+			int count=gwFlowService.isEnd(gwFlowDTO.getGwId());
+			if(count==0){
+				GwFlowDTO gwFlowDTOn=new GwFlowDTO();
+				gwFlowDTOn.setGwId(gwFlowDTO.getGwId());
+				gwFlowDTOn.setState("1");
+				UserDTO userDTO3=userService.getUserByLoginName("bgszr","10000");
+				gwFlowDTO.setCreateBy(userDTO3);
+				gwFlowDTO.setUpdateBy(userDTO3);
+				gwFlowDTO.setCreateTruename(userDTO.getName());
+				gwFlowDTO.setNextTruename(userDTO3.getName());
+				gwFlowDTO.setNextUser(userDTO3.getId());
+				gwFlowDTO.setWhich("3");
+				gwFlowService.saveOrUpdate (gwFlowWrapper.toEntity (gwFlowDTO));
+			}
 
 		}
 

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/gwflow/mapper/GwFlowMapper.java

@@ -17,4 +17,5 @@ import java.util.List;
 public interface GwFlowMapper extends BaseMapper<GwFlow> {
 
     List<GwFlowDTO> getByGwId(String Gwid);
+    int isEnd(String Gwid);
 }

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/gwflow/mapper/xml/GwFlowMapper.xml

@@ -26,4 +26,7 @@
 
     </select>
 
+    <select id="isEnd" resultType="Integer">
+        SELECT COUNT(id) FROM gw_flow WHERE gw_id =#{Gwid} and state=1
+    </select>
 </mapper>

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/gwflow/service/GwFlowService.java

@@ -25,4 +25,8 @@ public class GwFlowService extends ServiceImpl<GwFlowMapper, GwFlow> {
         return baseMapper.getByGwId(Gwid);
     }
 
+    public int isEnd(String Gwid){
+        return baseMapper.isEnd(Gwid);
+    }
+
 }

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

@@ -80,9 +80,10 @@ public class LoginController {
         String username = loginForm.getUsername ( );
         String password = loginForm.getPassword ( );
         String code = loginForm.getCode ( );
-        if ( !code.equals ( RedisUtils.getInstance ( ).get ( CacheNames.SYS_CACHE_CODE, loginForm.getUuid ( ) ) ) ) {
-            return ResponseEntity.badRequest ( ).body ( ErrorConstants.LOGIN_ERROR_ERROR_VALIDATE_CODE );
-        }
+        //开发关闭图片验证
+//        if ( !code.equals ( RedisUtils.getInstance ( ).get ( CacheNames.SYS_CACHE_CODE, loginForm.getUuid ( ) ) ) ) {
+//            return ResponseEntity.badRequest ( ).body ( ErrorConstants.LOGIN_ERROR_ERROR_VALIDATE_CODE );
+//        }
         SecurityUtils.login ( username, password, authenticationManager ); //登录操作spring security
 
         /**

jp-console/jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/domain/User.java

@@ -112,6 +112,8 @@ public class User extends BaseEntity {
      */
     private String remarks;
 
+    private String signPic;
+
     /**
      * 构造函数
      */

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

@@ -165,6 +165,7 @@ public class UserDTO extends BaseDTO {
     @ExcelIgnore
     private String sign;
 
+    private String signPic;
     /**
      * 登录token
      */

jp-ui/src/views/sys/login/components/login-form.vue

@@ -138,7 +138,7 @@ export default {
 				],
 				code: [
 					{
-						required: true,
+						required: false,
 						message: "验证码不能为空",
 						trigger: "blur",
 					},

jp-ui/src/views/sys/user/UserInfo.vue

@@ -154,6 +154,30 @@
 							</el-form-item>
 						</el-form>
 					</el-tab-pane>
+					<el-tab-pane label="上传手写签名">
+						<el-form
+							:model="signPicForm"
+							ref="signPicForm"
+							label-width="100px"
+						>
+							<el-form-item prop="signPic">
+								<image-select
+									v-model="signPicForm.signPic"
+
+									icon="el-icon-avatar"
+									title="手写签名"
+								></image-select>
+							</el-form-item>
+							<el-form-item>
+								<el-button
+									style="width: 148px"
+									type="primary"
+									@click="submitSignPicForm()"
+									>保存</el-button
+								>
+							</el-form-item>
+						</el-form>
+					</el-tab-pane>
 					<el-tab-pane label="联系方式">
 						<el-form
 							:model="concatForm"
@@ -434,6 +458,10 @@ export default {
 				id: "",
 				photo: "",
 			},
+			signPicForm: {
+				id: "",
+				signPic: "",
+			},
 			pwdForm: {
 				id: "",
 				oldPassword: "",
@@ -462,6 +490,7 @@ export default {
 				this.recover(this.generalForm, data);
 				this.recover(this.concatForm, data);
 				this.recover(this.photoForm, data);
+				this.recover(this.signPicForm, data);
 			});
 			this.refreshList();
 		}
@@ -514,6 +543,15 @@ export default {
 			loading.close();
 			this.$message.success(data);
 		},
+		async submitSignPicForm() {
+			const loading = this.$loading();
+			let data = await userService.saveInfo(this.signPicForm);
+			let { user } = await userService.info();
+			this.userInfo = user;
+			this.$TOOL.data.set("USER_INFO", user);
+			loading.close();
+			this.$message.success(data);
+		},
 		async submitPwdForm() {
 			let valid = await this.$refs["pwdForm"].validate();
 			if (valid) {