新增是否签字字段和签字图片字段

src/main/java/cn/timer/api/bean/spmk/SpmkExecutor.java

@@ -69,4 +69,7 @@ public class SpmkExecutor extends Model<SpmkExecutor> {
 	@ApiModelProperty(value = "创建时间 ", example = "创建时间")
 	@ApiModelProperty(value = "创建时间 ", example = "创建时间")
 	private Date updateTime;
 	private Date updateTime;
 
 
+	@ApiModelProperty(value = "签字图片 ", example = "签字图片")
+	private String signatureImg;
+
 }
 }
\ No newline at end of file

src/main/java/cn/timer/api/controller/spmk/SpmkController.java

@@ -13,6 +13,7 @@ import cn.timer.api.dao.spmk.*;
 import cn.timer.api.dto.spmk.*;
 import cn.timer.api.dto.spmk.*;
 import cn.timer.api.utils.redis.RedisUtil;
 import cn.timer.api.utils.redis.RedisUtil;
 import com.baomidou.mybatisplus.core.toolkit.SerializationUtils;
 import com.baomidou.mybatisplus.core.toolkit.SerializationUtils;
+import net.sf.json.JSON;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONArray;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
@@ -332,7 +333,7 @@ public class SpmkController {
 	@ApiOperation(value = "11.查询列表-审批组-个人审批", httpMethod = "GET", notes = "查询列表-审批组-个人审批")
 	@ApiOperation(value = "11.查询列表-审批组-个人审批", httpMethod = "GET", notes = "查询列表-审批组-个人审批")
 	@ApiOperationSupport(order = 11)
 	@ApiOperationSupport(order = 11)
 	public Result<Object> selectListAg(@CurrentUser UserBean userBean){
 	public Result<Object> selectListAg(@CurrentUser UserBean userBean){
-
+		List<SpmkApprovalG> spmkApprovalGS = spmkService.selectListAg(userBean);
 		return ResultUtil.data(spmkService.selectListAg(userBean));
 		return ResultUtil.data(spmkService.selectListAg(userBean));
 	}
 	}
 
 
@@ -806,7 +807,8 @@ public class SpmkController {
 					approvingDto.getExecutorId(),
 					approvingDto.getExecutorId(),
 					approvingDto.getOpinion(),
 					approvingDto.getOpinion(),
 					approvingDto.getSts(),
 					approvingDto.getSts(),
-					approvingDto.getUser()
+					approvingDto.getUser(),
+					approvingDto.getSignatureImg()
 			);
 			);
 
 
 			// 更新 flowChildren
 			// 更新 flowChildren

src/main/java/cn/timer/api/dto/spmk/ApprovingDto.java

@@ -37,4 +37,7 @@ public class ApprovingDto {
 	@ApiModelProperty(value = "被转派人 ", example = "对象")
 	@ApiModelProperty(value = "被转派人 ", example = "对象")
 	private User user;
 	private User user;
 
 
+	@ApiModelProperty(value = "签字图片 ", example = "签字图片")
+	private String signatureImg;
+
 }
 }

src/main/java/cn/timer/api/dto/spmk/User.java

@@ -26,4 +26,6 @@ public class User implements Serializable{
 	
 	
 	private String headUrl;
 	private String headUrl;
 
 
+	private Integer signature;
+
 }
 }

src/main/java/cn/timer/api/utils/router/RouterUtils.java

@@ -536,7 +536,7 @@ public class RouterUtils {
 	 * @param opinion			意见
 	 * @param opinion			意见
 	 * @param sts				状态 1执行中 2通过 3拒绝
 	 * @param sts				状态 1执行中 2通过 3拒绝
 	 */
 	 */
-	public static void approving(List<FlowChildren> listFlowChildren,Integer asId,Integer executeRecordId, Integer executorId, String opinion,Integer sts,User redeployUser ) throws Exception {
+	public static void approving(List<FlowChildren> listFlowChildren,Integer asId,Integer executeRecordId, Integer executorId, String opinion,Integer sts,User redeployUser,String signatureImg ) throws Exception {
 		
 		
 		boolean hasNextApprover = false;
 		boolean hasNextApprover = false;
 		
 		
@@ -563,6 +563,7 @@ public class RouterUtils {
 							.executorName(listUser.get(i_user).getName())
 							.executorName(listUser.get(i_user).getName())
 							.operatorHeaderUrl(listUser.get(i_user).getHeadUrl())
 							.operatorHeaderUrl(listUser.get(i_user).getHeadUrl())
 							.sts(sts)
 							.sts(sts)
+							.signatureImg(signatureImg)
 							.build()
 							.build()
 						.updateById();
 						.updateById();
 						listUser.get(i_user).setExecute(EXECUTED);
 						listUser.get(i_user).setExecute(EXECUTED);

src/main/resources/mapping/spmk/SpmkExecutorMapper.xml

@@ -13,6 +13,7 @@
                 <result column="sts" property="sts" />
                 <result column="sts" property="sts" />
                 <result column="create_time" property="createTime" />
                 <result column="create_time" property="createTime" />
                 <result column="update_time" property="updateTime" />
                 <result column="update_time" property="updateTime" />
+                <result column="signature_img" property="signatureImg" />
     </resultMap>
     </resultMap>
 
 
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
@@ -24,7 +25,8 @@
                 opinion,
                 opinion,
                 sts,
                 sts,
                 create_time,
                 create_time,
-                update_time
+                update_time,
+                signature_img,
     </sql>
     </sql>
     
     
     <sql id="Base_Column_List_Alias">
     <sql id="Base_Column_List_Alias">