新增isimport字段判断身份证照片和合同来自哪一个项目

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/controller/HlgUserController.java

@@ -115,6 +115,7 @@ public class HlgUserController {
 		if(hlgUserEntity==null) {
 			result.error500("未找到对应实体");
 		}else {
+			hlgUser.setIsImport(0);
 			boolean ok = hlgUserService.updateById(hlgUser);
 			//TODO 返回false说明什么？
 			if(ok) {

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/controller/HlgUserSubcontractController.java

@@ -98,6 +98,7 @@ public class HlgUserSubcontractController {
 		if(hlgUserSubcontractEntity==null) {
 			result.error500("未找到对应实体");
 		}else {
+			hlgUserSubcontract.setIsImport(0);
 			boolean ok = hlgUserSubcontractService.updateById(hlgUserSubcontract);
 			//TODO 返回false说明什么？
 			if(ok) {
@@ -163,7 +164,7 @@ public class HlgUserSubcontractController {
       * 导出excel
    *
    * @param request
-   * @param response
+   * @param
    */
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, HlgUserSubcontract hlgUserSubcontract) {

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/entity/HlgUser.java

@@ -63,4 +63,6 @@ public class HlgUser implements Serializable {
 
 	@TableField(exist = false)
 	private Integer subcontractType;//(1:未上传  2：已上传)  用于查询
+
+	private Integer isImport; //是否导入（0：否 1：是）
 }

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/entity/HlgUserSubcontract.java

@@ -46,4 +46,6 @@ public class HlgUserSubcontract implements Serializable {
 	/**生成者*/
 	@Excel(name = "生成者", width = 15)
 	private String generateBy;
+
+	private Integer isImport; //是否导入（0：否 1：是）
 }

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/mapper/xml/HlgUserMapper.xml

@@ -13,7 +13,8 @@
 		a.create_by AS "createBy.id",
 		a.update_time AS "updateTime",
 		a.update_by AS "updateBy.id",
-		a.last_payment_company as "lastPaymentCompany"
+		a.last_payment_company as "lastPaymentCompany",
+		a.is_import as "isImport"
 	</sql>
 
     <sql id="hlgUserJoins">

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/mapper/xml/HlgUserSubcontractMapper.xml

@@ -9,7 +9,8 @@
 		a.subcontract AS "subcontract",
 		a.sys_org_code AS "sysOrgCode",
 		a.genrate_time AS "genrateTime",
-		a.generate_by AS "generateBy"
+		a.generate_by AS "generateBy",
+		a.is_import as "isImport"
 	</sql>
 
     <sql id="hlgUserSubcontractJoins">