后端: 资质配置导出-服务类-Java方式导出接口

src/dashoo.cn/backend/api/business/oilsupplier/technologyservice/oiltechnologyservice.go

@@ -82,140 +82,140 @@ type OilTechnologyService struct {
 }
 
 type OilTechnologyServiceTmp struct {
-	Code             string `xorm:"default '' VARCHAR(50) 'code'"`
-	Name             string `xorm:"default '' VARCHAR(50) 'name'"`
-	Id                int       `xorm:"not null pk autoincr INT(10)"`
-	ClassId           int       `xorm:"not null default '' comment('分类ID') INT(11)"`
-	OrgId             int       `xorm:"default 0 comment('部门ID') INT(10)"`
-	OrgName           string    `xorm:"default '' comment('部门名称') VARCHAR(100)"`
-	F01               string    `xorm:"default '' VARCHAR(2)"`
-	F02               string    `xorm:"default '' VARCHAR(2)"`
-	F03               string    `xorm:"default '' VARCHAR(2)"`
-	F04               string    `xorm:"default '' VARCHAR(2)"`
-	F05               string    `xorm:"default '' VARCHAR(2)"`
-	F06               string    `xorm:"default '' VARCHAR(2)"`
-	F07               string    `xorm:"default '' VARCHAR(2)"`
-	F08               string    `xorm:"default '' VARCHAR(2)"`
-	F09               string    `xorm:"default '' VARCHAR(2)"`
-	F10               string    `xorm:"default '' VARCHAR(2)"`
-	F11               string    `xorm:"default '' VARCHAR(2)"`
-	F12               string    `xorm:"default '' VARCHAR(2)"`
-	F13               string    `xorm:"default '' VARCHAR(2)"`
-	F14               string    `xorm:"default '' VARCHAR(2)"`
-	F15               string    `xorm:"default '' VARCHAR(2)"`
-	F16               string    `xorm:"default '' VARCHAR(2)"`
-	F17               string    `xorm:"default '' VARCHAR(2)"`
-	F18               string    `xorm:"default '' VARCHAR(2)"`
-	F19               string    `xorm:"default '' VARCHAR(2)"`
-	F20               string    `xorm:"default '' VARCHAR(2)"`
-	F21               string    `xorm:"default '' VARCHAR(2)"`
-	F22               string    `xorm:"default '' VARCHAR(2)"`
-	F23               string    `xorm:"default '' VARCHAR(2)"`
-	F24               string    `xorm:"default '' VARCHAR(2)"`
-	F25               string    `xorm:"default '' VARCHAR(2)"`
-	F26               string    `xorm:"default '' VARCHAR(2)"`
-	F27               string    `xorm:"default '' VARCHAR(2)"`
-	F28               string    `xorm:"default '' VARCHAR(2)"`
-	F29               string    `xorm:"default '' VARCHAR(2)"`
-	F30               string    `xorm:"default '' VARCHAR(2)"`
-	F31               string    `xorm:"default '' VARCHAR(2)"`
-	F32               string    `xorm:"default '' VARCHAR(2)"`
-	F33               string    `xorm:"default '' VARCHAR(2)"`
-	F34               string    `xorm:"default '' VARCHAR(2)"`
-	F35               string    `xorm:"default '' VARCHAR(2)"`
-	F36               string    `xorm:"default '' VARCHAR(2)"`
-	F37               string    `xorm:"default '' VARCHAR(2)"`
-	F38               string    `xorm:"default '' VARCHAR(2)"`
-	F39               string    `xorm:"default '' VARCHAR(2)"`
-	F40               string    `xorm:"default '' VARCHAR(2)"`
-	F41               string    `xorm:"default '' VARCHAR(2)"`
-	F42               string    `xorm:"default '' VARCHAR(2)"`
-	F43               string    `xorm:"default '' VARCHAR(2)"`
-	F44               string    `xorm:"default '' VARCHAR(2)"`
-	F45               string    `xorm:"default '' VARCHAR(2)"`
-	F46               string    `xorm:"default '' VARCHAR(2)"`
-	F47               string    `xorm:"default '' VARCHAR(2)"`
-	F48               string    `xorm:"default '' VARCHAR(2)"`
-	F49               string    `xorm:"default '' VARCHAR(2)"`
-	F50               string    `xorm:"default '' VARCHAR(2)"`
-	F51               string    `xorm:"default '' VARCHAR(2)"`
-	F52               string    `xorm:"default '' VARCHAR(2)"`
-	F53               string    `xorm:"default '' VARCHAR(2)"`
-	F54               string    `xorm:"default '' VARCHAR(2)"`
-	F55               string    `xorm:"default '' VARCHAR(2)"`
-	F56               string    `xorm:"default '' VARCHAR(2)"`
-	F57               string    `xorm:"default '' VARCHAR(2)"`
-	F58               string    `xorm:"default '' VARCHAR(2)"`
-	F59               string    `xorm:"default '' VARCHAR(2)"`
-	F60               string    `xorm:"default '' VARCHAR(2)"`
-	F61               string    `xorm:"default '' VARCHAR(2)"`
-	F62               string    `xorm:"default '' VARCHAR(2)"`
+	Code    string `xorm:"default '' VARCHAR(50) 'code'"`
+	Name    string `xorm:"default '' VARCHAR(50) 'name'"`
+	Id      int    `xorm:"not null pk autoincr INT(10)"`
+	ClassId int    `xorm:"not null default '' comment('分类ID') INT(11)"`
+	OrgId   int    `xorm:"default 0 comment('部门ID') INT(10)"`
+	OrgName string `xorm:"default '' comment('部门名称') VARCHAR(100)"`
+	F01     string `xorm:"default '' VARCHAR(2)"`
+	F02     string `xorm:"default '' VARCHAR(2)"`
+	F03     string `xorm:"default '' VARCHAR(2)"`
+	F04     string `xorm:"default '' VARCHAR(2)"`
+	F05     string `xorm:"default '' VARCHAR(2)"`
+	F06     string `xorm:"default '' VARCHAR(2)"`
+	F07     string `xorm:"default '' VARCHAR(2)"`
+	F08     string `xorm:"default '' VARCHAR(2)"`
+	F09     string `xorm:"default '' VARCHAR(2)"`
+	F10     string `xorm:"default '' VARCHAR(2)"`
+	F11     string `xorm:"default '' VARCHAR(2)"`
+	F12     string `xorm:"default '' VARCHAR(2)"`
+	F13     string `xorm:"default '' VARCHAR(2)"`
+	F14     string `xorm:"default '' VARCHAR(2)"`
+	F15     string `xorm:"default '' VARCHAR(2)"`
+	F16     string `xorm:"default '' VARCHAR(2)"`
+	F17     string `xorm:"default '' VARCHAR(2)"`
+	F18     string `xorm:"default '' VARCHAR(2)"`
+	F19     string `xorm:"default '' VARCHAR(2)"`
+	F20     string `xorm:"default '' VARCHAR(2)"`
+	F21     string `xorm:"default '' VARCHAR(2)"`
+	F22     string `xorm:"default '' VARCHAR(2)"`
+	F23     string `xorm:"default '' VARCHAR(2)"`
+	F24     string `xorm:"default '' VARCHAR(2)"`
+	F25     string `xorm:"default '' VARCHAR(2)"`
+	F26     string `xorm:"default '' VARCHAR(2)"`
+	F27     string `xorm:"default '' VARCHAR(2)"`
+	F28     string `xorm:"default '' VARCHAR(2)"`
+	F29     string `xorm:"default '' VARCHAR(2)"`
+	F30     string `xorm:"default '' VARCHAR(2)"`
+	F31     string `xorm:"default '' VARCHAR(2)"`
+	F32     string `xorm:"default '' VARCHAR(2)"`
+	F33     string `xorm:"default '' VARCHAR(2)"`
+	F34     string `xorm:"default '' VARCHAR(2)"`
+	F35     string `xorm:"default '' VARCHAR(2)"`
+	F36     string `xorm:"default '' VARCHAR(2)"`
+	F37     string `xorm:"default '' VARCHAR(2)"`
+	F38     string `xorm:"default '' VARCHAR(2)"`
+	F39     string `xorm:"default '' VARCHAR(2)"`
+	F40     string `xorm:"default '' VARCHAR(2)"`
+	F41     string `xorm:"default '' VARCHAR(2)"`
+	F42     string `xorm:"default '' VARCHAR(2)"`
+	F43     string `xorm:"default '' VARCHAR(2)"`
+	F44     string `xorm:"default '' VARCHAR(2)"`
+	F45     string `xorm:"default '' VARCHAR(2)"`
+	F46     string `xorm:"default '' VARCHAR(2)"`
+	F47     string `xorm:"default '' VARCHAR(2)"`
+	F48     string `xorm:"default '' VARCHAR(2)"`
+	F49     string `xorm:"default '' VARCHAR(2)"`
+	F50     string `xorm:"default '' VARCHAR(2)"`
+	F51     string `xorm:"default '' VARCHAR(2)"`
+	F52     string `xorm:"default '' VARCHAR(2)"`
+	F53     string `xorm:"default '' VARCHAR(2)"`
+	F54     string `xorm:"default '' VARCHAR(2)"`
+	F55     string `xorm:"default '' VARCHAR(2)"`
+	F56     string `xorm:"default '' VARCHAR(2)"`
+	F57     string `xorm:"default '' VARCHAR(2)"`
+	F58     string `xorm:"default '' VARCHAR(2)"`
+	F59     string `xorm:"default '' VARCHAR(2)"`
+	F60     string `xorm:"default '' VARCHAR(2)"`
+	F61     string `xorm:"default '' VARCHAR(2)"`
+	F62     string `xorm:"default '' VARCHAR(2)"`
 
-	TmpF01               string    `json:"tmpF01"`
-	TmpF02               string    `json:"tmpF02"`
-	TmpF03               string    `json:"tmpF03"`
-	TmpF04               string    `json:"tmpF04"`
-	TmpF05               string    `json:"tmpF05"`
-	TmpF06               string    `json:"tmpF06"`
-	TmpF07               string    `json:"tmpF07"`
-	TmpF08               string    `json:"tmpF08"`
-	TmpF09               string    `json:"tmpF09"`
-	TmpF10               string    `json:"tmpF10"`
-	TmpF11               string    `json:"tmpF11"`
-	TmpF12               string    `json:"tmpF12"`
-	TmpF13               string    `json:"tmpF13"`
-	TmpF14               string    `json:"tmpF14"`
-	TmpF15               string    `json:"tmpF15"`
-	TmpF16               string    `json:"tmpF16"`
-	TmpF17               string    `json:"tmpF17"`
-	TmpF18               string    `json:"tmpF18"`
-	TmpF19               string    `json:"tmpF19"`
-	TmpF20               string    `json:"tmpF20"`
-	TmpF21               string    `json:"tmpF21"`
-	TmpF22               string    `json:"tmpF22"`
-	TmpF23               string    `json:"tmpF23"`
-	TmpF24               string    `json:"tmpF24"`
-	TmpF25               string    `json:"tmpF25"`
-	TmpF26               string    `json:"tmpF26"`
-	TmpF27               string    `json:"tmpF27"`
-	TmpF28               string    `json:"tmpF28"`
-	TmpF29               string    `json:"tmpF29"`
-	TmpF30               string    `json:"tmpF30"`
-	TmpF31               string    `json:"tmpF31"`
-	TmpF32               string    `json:"tmpF32"`
-	TmpF33               string    `json:"tmpF33"`
-	TmpF34               string    `json:"tmpF34"`
-	TmpF35               string    `json:"tmpF35"`
-	TmpF36               string    `json:"tmpF36"`
-	TmpF37               string    `json:"tmpF37"`
-	TmpF38               string    `json:"tmpF38"`
-	TmpF39               string    `json:"tmpF39"`
-	TmpF40               string    `json:"tmpF40"`
-	TmpF41               string    `json:"tmpF41"`
-	TmpF42               string    `json:"tmpF42"`
-	TmpF43               string    `json:"tmpF43"`
-	TmpF44               string    `json:"tmpF44"`
-	TmpF45               string    `json:"tmpF45"`
-	TmpF46               string    `json:"tmpF46"`
-	TmpF47               string    `json:"tmpF47"`
-	TmpF48               string    `json:"tmpF48"`
-	TmpF49               string    `json:"tmpF49"`
-	TmpF50               string    `json:"tmpF50"`
-	TmpF51               string    `json:"tmpF51"`
-	TmpF52               string    `json:"tmpF52"`
-	TmpF53               string    `json:"tmpF53"`
-	TmpF54               string    `json:"tmpF54"`
-	TmpF55               string    `json:"tmpF55"`
-	TmpF56               string    `json:"tmpF56"`
-	TmpF57               string    `json:"tmpF57"`
-	TmpF58               string    `json:"tmpF58"`
-	TmpF59               string    `json:"tmpF59"`
-	TmpF60               string    `json:"tmpF60"`
-	TmpF61               string    `json:"tmpF61"`
-	TmpF62               string    `json:"tmpF62"`
+	TmpF01 string `json:"tmpF01"`
+	TmpF02 string `json:"tmpF02"`
+	TmpF03 string `json:"tmpF03"`
+	TmpF04 string `json:"tmpF04"`
+	TmpF05 string `json:"tmpF05"`
+	TmpF06 string `json:"tmpF06"`
+	TmpF07 string `json:"tmpF07"`
+	TmpF08 string `json:"tmpF08"`
+	TmpF09 string `json:"tmpF09"`
+	TmpF10 string `json:"tmpF10"`
+	TmpF11 string `json:"tmpF11"`
+	TmpF12 string `json:"tmpF12"`
+	TmpF13 string `json:"tmpF13"`
+	TmpF14 string `json:"tmpF14"`
+	TmpF15 string `json:"tmpF15"`
+	TmpF16 string `json:"tmpF16"`
+	TmpF17 string `json:"tmpF17"`
+	TmpF18 string `json:"tmpF18"`
+	TmpF19 string `json:"tmpF19"`
+	TmpF20 string `json:"tmpF20"`
+	TmpF21 string `json:"tmpF21"`
+	TmpF22 string `json:"tmpF22"`
+	TmpF23 string `json:"tmpF23"`
+	TmpF24 string `json:"tmpF24"`
+	TmpF25 string `json:"tmpF25"`
+	TmpF26 string `json:"tmpF26"`
+	TmpF27 string `json:"tmpF27"`
+	TmpF28 string `json:"tmpF28"`
+	TmpF29 string `json:"tmpF29"`
+	TmpF30 string `json:"tmpF30"`
+	TmpF31 string `json:"tmpF31"`
+	TmpF32 string `json:"tmpF32"`
+	TmpF33 string `json:"tmpF33"`
+	TmpF34 string `json:"tmpF34"`
+	TmpF35 string `json:"tmpF35"`
+	TmpF36 string `json:"tmpF36"`
+	TmpF37 string `json:"tmpF37"`
+	TmpF38 string `json:"tmpF38"`
+	TmpF39 string `json:"tmpF39"`
+	TmpF40 string `json:"tmpF40"`
+	TmpF41 string `json:"tmpF41"`
+	TmpF42 string `json:"tmpF42"`
+	TmpF43 string `json:"tmpF43"`
+	TmpF44 string `json:"tmpF44"`
+	TmpF45 string `json:"tmpF45"`
+	TmpF46 string `json:"tmpF46"`
+	TmpF47 string `json:"tmpF47"`
+	TmpF48 string `json:"tmpF48"`
+	TmpF49 string `json:"tmpF49"`
+	TmpF50 string `json:"tmpF50"`
+	TmpF51 string `json:"tmpF51"`
+	TmpF52 string `json:"tmpF52"`
+	TmpF53 string `json:"tmpF53"`
+	TmpF54 string `json:"tmpF54"`
+	TmpF55 string `json:"tmpF55"`
+	TmpF56 string `json:"tmpF56"`
+	TmpF57 string `json:"tmpF57"`
+	TmpF58 string `json:"tmpF58"`
+	TmpF59 string `json:"tmpF59"`
+	TmpF60 string `json:"tmpF60"`
+	TmpF61 string `json:"tmpF61"`
+	TmpF62 string `json:"tmpF62"`
 
-	TmpName              string    `json:"tmpName"`
-	Checked		 		 int    `json:"checked"`
+	TmpName string `json:"tmpName"`
+	Checked int    `json:"checked"`
 
 	Remark            string    `xorm:"comment('备注') VARCHAR(500)"`
 	DeletionStateCode int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
@@ -241,6 +241,19 @@ type OilTechnologyServiceView struct {
 	OilTechnologyService `xorm:"extends"`
 }
 
+type OilTechnologyServiceViewVM struct {
+	Code1         string `xorm:"default '' VARCHAR(50) 'code1'"`
+	Name1         string `xorm:"default '' VARCHAR(50) 'name1'"`
+	Code2         string `xorm:"default '' VARCHAR(50) 'code2'"`
+	Name2         string `xorm:"default '' VARCHAR(50) 'name2'"`
+	Code3         string `xorm:"default '' VARCHAR(50) 'code3'"`
+	Name3         string `xorm:"default '' VARCHAR(50) 'name3'"`
+	Code4         string `xorm:"default '' VARCHAR(50) 'code4'"`
+	Name4         string `xorm:"default '' VARCHAR(50) 'name4'"`
+	OrgName       string `xorm:"default '' VARCHAR(255) 'orgName'"`
+	AllNeedApName string `xorm:"default '' TEXT 'allNeedName'"`
+}
+
 type OilTechnologyClassServiceView struct {
 	Id    int
 	Id1   int
@@ -272,7 +285,7 @@ type TechnologyBusiness struct {
 type OilTechnologyServiceAndCode struct {
 	Id                int       `xorm:"not null pk autoincr INT(10)"`
 	ClassId           int       `xorm:"not null default '' comment('分类ID') INT(11)"`
-	Code              string	`xorm:"default '' VARCHAR(50)"`
+	Code              string    `xorm:"default '' VARCHAR(50)"`
 	OrgId             int       `xorm:"default 0 comment('部门ID') INT(10)"`
 	OrgName           string    `xorm:"default '' comment('部门名称') VARCHAR(100)"`
 	F01               string    `xorm:"default '' VARCHAR(2)"`
@@ -425,66 +438,66 @@ type Tmp_OilTechnologyService struct {
 }
 
 type OilTechnologyF struct {
-	F01               string    `xorm:"default '' VARCHAR(2)"`
-	F02               string    `xorm:"default '' VARCHAR(2)"`
-	F03               string    `xorm:"default '' VARCHAR(2)"`
-	F04               string    `xorm:"default '' VARCHAR(2)"`
-	F05               string    `xorm:"default '' VARCHAR(2)"`
-	F06               string    `xorm:"default '' VARCHAR(2)"`
-	F07               string    `xorm:"default '' VARCHAR(2)"`
-	F08               string    `xorm:"default '' VARCHAR(2)"`
-	F09               string    `xorm:"default '' VARCHAR(2)"`
-	F10               string    `xorm:"default '' VARCHAR(2)"`
-	F11               string    `xorm:"default '' VARCHAR(2)"`
-	F12               string    `xorm:"default '' VARCHAR(2)"`
-	F13               string    `xorm:"default '' VARCHAR(2)"`
-	F14               string    `xorm:"default '' VARCHAR(2)"`
-	F15               string    `xorm:"default '' VARCHAR(2)"`
-	F16               string    `xorm:"default '' VARCHAR(2)"`
-	F17               string    `xorm:"default '' VARCHAR(2)"`
-	F18               string    `xorm:"default '' VARCHAR(2)"`
-	F19               string    `xorm:"default '' VARCHAR(2)"`
-	F20               string    `xorm:"default '' VARCHAR(2)"`
-	F21               string    `xorm:"default '' VARCHAR(2)"`
-	F22               string    `xorm:"default '' VARCHAR(2)"`
-	F23               string    `xorm:"default '' VARCHAR(2)"`
-	F24               string    `xorm:"default '' VARCHAR(2)"`
-	F25               string    `xorm:"default '' VARCHAR(2)"`
-	F26               string    `xorm:"default '' VARCHAR(2)"`
-	F27               string    `xorm:"default '' VARCHAR(2)"`
-	F28               string    `xorm:"default '' VARCHAR(2)"`
-	F29               string    `xorm:"default '' VARCHAR(2)"`
-	F30               string    `xorm:"default '' VARCHAR(2)"`
-	F31               string    `xorm:"default '' VARCHAR(2)"`
-	F32               string    `xorm:"default '' VARCHAR(2)"`
-	F33               string    `xorm:"default '' VARCHAR(2)"`
-	F34               string    `xorm:"default '' VARCHAR(2)"`
-	F35               string    `xorm:"default '' VARCHAR(2)"`
-	F36               string    `xorm:"default '' VARCHAR(2)"`
-	F37               string    `xorm:"default '' VARCHAR(2)"`
-	F38               string    `xorm:"default '' VARCHAR(2)"`
-	F39               string    `xorm:"default '' VARCHAR(2)"`
-	F40               string    `xorm:"default '' VARCHAR(2)"`
-	F41               string    `xorm:"default '' VARCHAR(2)"`
-	F42               string    `xorm:"default '' VARCHAR(2)"`
-	F43               string    `xorm:"default '' VARCHAR(2)"`
-	F44               string    `xorm:"default '' VARCHAR(2)"`
-	F45               string    `xorm:"default '' VARCHAR(2)"`
-	F46               string    `xorm:"default '' VARCHAR(2)"`
-	F47               string    `xorm:"default '' VARCHAR(2)"`
-	F48               string    `xorm:"default '' VARCHAR(2)"`
-	F49               string    `xorm:"default '' VARCHAR(2)"`
-	F50               string    `xorm:"default '' VARCHAR(2)"`
-	F51               string    `xorm:"default '' VARCHAR(2)"`
-	F52               string    `xorm:"default '' VARCHAR(2)"`
-	F53               string    `xorm:"default '' VARCHAR(2)"`
-	F54               string    `xorm:"default '' VARCHAR(2)"`
-	F55               string    `xorm:"default '' VARCHAR(2)"`
-	F56               string    `xorm:"default '' VARCHAR(2)"`
-	F57               string    `xorm:"default '' VARCHAR(2)"`
-	F58               string    `xorm:"default '' VARCHAR(2)"`
-	F59               string    `xorm:"default '' VARCHAR(2)"`
-	F60               string    `xorm:"default '' VARCHAR(2)"`
-	F61               string    `xorm:"default '' VARCHAR(2)"`
-	F62               string    `xorm:"default '' VARCHAR(2)"`
-}
+	F01 string `xorm:"default '' VARCHAR(2)"`
+	F02 string `xorm:"default '' VARCHAR(2)"`
+	F03 string `xorm:"default '' VARCHAR(2)"`
+	F04 string `xorm:"default '' VARCHAR(2)"`
+	F05 string `xorm:"default '' VARCHAR(2)"`
+	F06 string `xorm:"default '' VARCHAR(2)"`
+	F07 string `xorm:"default '' VARCHAR(2)"`
+	F08 string `xorm:"default '' VARCHAR(2)"`
+	F09 string `xorm:"default '' VARCHAR(2)"`
+	F10 string `xorm:"default '' VARCHAR(2)"`
+	F11 string `xorm:"default '' VARCHAR(2)"`
+	F12 string `xorm:"default '' VARCHAR(2)"`
+	F13 string `xorm:"default '' VARCHAR(2)"`
+	F14 string `xorm:"default '' VARCHAR(2)"`
+	F15 string `xorm:"default '' VARCHAR(2)"`
+	F16 string `xorm:"default '' VARCHAR(2)"`
+	F17 string `xorm:"default '' VARCHAR(2)"`
+	F18 string `xorm:"default '' VARCHAR(2)"`
+	F19 string `xorm:"default '' VARCHAR(2)"`
+	F20 string `xorm:"default '' VARCHAR(2)"`
+	F21 string `xorm:"default '' VARCHAR(2)"`
+	F22 string `xorm:"default '' VARCHAR(2)"`
+	F23 string `xorm:"default '' VARCHAR(2)"`
+	F24 string `xorm:"default '' VARCHAR(2)"`
+	F25 string `xorm:"default '' VARCHAR(2)"`
+	F26 string `xorm:"default '' VARCHAR(2)"`
+	F27 string `xorm:"default '' VARCHAR(2)"`
+	F28 string `xorm:"default '' VARCHAR(2)"`
+	F29 string `xorm:"default '' VARCHAR(2)"`
+	F30 string `xorm:"default '' VARCHAR(2)"`
+	F31 string `xorm:"default '' VARCHAR(2)"`
+	F32 string `xorm:"default '' VARCHAR(2)"`
+	F33 string `xorm:"default '' VARCHAR(2)"`
+	F34 string `xorm:"default '' VARCHAR(2)"`
+	F35 string `xorm:"default '' VARCHAR(2)"`
+	F36 string `xorm:"default '' VARCHAR(2)"`
+	F37 string `xorm:"default '' VARCHAR(2)"`
+	F38 string `xorm:"default '' VARCHAR(2)"`
+	F39 string `xorm:"default '' VARCHAR(2)"`
+	F40 string `xorm:"default '' VARCHAR(2)"`
+	F41 string `xorm:"default '' VARCHAR(2)"`
+	F42 string `xorm:"default '' VARCHAR(2)"`
+	F43 string `xorm:"default '' VARCHAR(2)"`
+	F44 string `xorm:"default '' VARCHAR(2)"`
+	F45 string `xorm:"default '' VARCHAR(2)"`
+	F46 string `xorm:"default '' VARCHAR(2)"`
+	F47 string `xorm:"default '' VARCHAR(2)"`
+	F48 string `xorm:"default '' VARCHAR(2)"`
+	F49 string `xorm:"default '' VARCHAR(2)"`
+	F50 string `xorm:"default '' VARCHAR(2)"`
+	F51 string `xorm:"default '' VARCHAR(2)"`
+	F52 string `xorm:"default '' VARCHAR(2)"`
+	F53 string `xorm:"default '' VARCHAR(2)"`
+	F54 string `xorm:"default '' VARCHAR(2)"`
+	F55 string `xorm:"default '' VARCHAR(2)"`
+	F56 string `xorm:"default '' VARCHAR(2)"`
+	F57 string `xorm:"default '' VARCHAR(2)"`
+	F58 string `xorm:"default '' VARCHAR(2)"`
+	F59 string `xorm:"default '' VARCHAR(2)"`
+	F60 string `xorm:"default '' VARCHAR(2)"`
+	F61 string `xorm:"default '' VARCHAR(2)"`
+	F62 string `xorm:"default '' VARCHAR(2)"`
+}

src/dashoo.cn/backend/api/business/workflow/ActivitiService.go

@@ -723,6 +723,58 @@ func (this *ActivitiService) ContrastExcel(datas map[string]interface{}, templat
 	return retDocUrl
 }
 
+/**
+资质配置Java导出
+*/
+func (this *ActivitiService) ExportAptitudeExcel(datas map[string]interface{}, supplierType string, templateUrl string, fileName string) string {
+	var aptitudeVm excelAptitudeVM
+	aptitudeVm.SupplierType = supplierType
+	aptitudeVm.DataList = datas
+	aptitudeVm.TemplateUrl = templateUrl
+	aptitudeVm.FileName = "tech_service_tmp_new.xlsx"
+	jsonParam, err := json.Marshal(aptitudeVm)
+	if err != nil {
+		fmt.Println(err, "生成json字符串错误")
+	}
+	params := string(jsonParam)
+	retVal := this.PostOrigin("/excel/aptitude-excel", params, "")
+	if retVal.StatusCode != 200 {
+		return ""
+	}
+
+	_dir := utils.Cfg.MustValue("file", "tmplateDir") + "excel"
+	utils.CreatePath(_dir)
+	_dir += "/tmp_" + strconv.Itoa(int(time.Now().Unix())) + ".xlsx"
+	raw := retVal.Body
+	defer raw.Close()
+
+	file, err := os.Create(_dir)
+	defer file.Close()
+	writer := bufio.NewWriter(file)
+	defer writer.Flush()
+	body, err := ioutil.ReadAll(raw)
+	writer.Write(body)
+
+	if err != nil {
+		return ""
+	}
+	var sw *Seaweed
+	var filer []string
+	if _filer := os.Getenv("GOSWFS_FILER_URL"); _filer != "" {
+		filer = []string{_filer}
+	}
+	fmt.Println("GOSWFS_FILER_URL2 == ", os.Getenv("GOSWFS_FILER_URL"))
+	sw = NewSeaweed("http", utils.Cfg.MustValue("file", "upFileHost"), filer, 2*1024*1024, 5*time.Minute)
+	//_, fID, err := sw.Upload(retVal.Body, "tmp.pdf", int64(len(pdfByte)), "", "")
+	_, _, fID, err := sw.UploadFile(_dir, "", "")
+	fmt.Println("err_表单下载2=", err)
+	fmt.Println("fID_表单下载2=", fID)
+	retDocUrl := utils.Cfg.MustValue("file", "downFileHost") + "/" + fID
+	os.Remove(_dir)
+	fmt.Println("==retDocUrl==", retDocUrl)
+	return retDocUrl
+}
+
 // 带水印
 func (this *ActivitiService) FillWordWatermarkTemplate(datas map[string]interface{}, templateUrl string, fileName, watermark string) string {
 	var wordTempVM WordTemplateWatermarkVM

src/dashoo.cn/backend/api/business/workflow/workflow.go

@@ -88,6 +88,12 @@ type excelContrastVM struct {
 	TemplateUrl string                 `json:"templateUrl"`
 	FileName    string                 `json:"fileName"`
 }
+type excelAptitudeVM struct {
+	SupplierType string                 `json:"supplierType"`
+	DataList     map[string]interface{} `json:"dataList"`
+	TemplateUrl  string                 `json:"templateUrl"`
+	FileName     string                 `json:"fileName"`
+}
 type WordTemplateWatermarkVM struct {
 	Datas       map[string]interface{} `json:"datas"`
 	TemplateUrl string                 `json:"templateUrl"`

src/dashoo.cn/backend/api/controllers/oilsupplier/basisbuild.go

@@ -305,10 +305,10 @@ func (this *OilBasisBuildController) UpdateEntity() {
 
 		"ModifiedBy",
 	}
-	svc.GetEntityByWhere(OilBasisBuildName, "Id  = " + id, &model1)
+	svc.GetEntityByWhere(OilBasisBuildName, "Id  = "+id, &model1)
 	err := svc.UpdateEntityBytbl(""+OilBasisBuildName, id, &model, cols)
 	if model1.Name != model.Name {
-		err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &model, []string{"Name"}, "SubClassId = " + id + " and SupplierTypeCode = '02' and Name = '" + model1.Name + "'")
+		err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &model, []string{"Name"}, "SubClassId = "+id+" and SupplierTypeCode = '02' and Name = '"+model1.Name+"'")
 	}
 	if err == nil {
 		errinfo.Message = "修改成功！"
@@ -1276,7 +1276,7 @@ func (this *OilBasisBuildController) ExeclExport() {
 	var datainfo ErrorDataInfo
 	datainfo.Code = 0
 	datainfo.Item = retDocUrl
-	datainfo.Message = "打印成功"
+	datainfo.Message = "导出成功"
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
 

src/dashoo.cn/backend/api/controllers/oilsupplier/technologyservice.go

@@ -513,7 +513,7 @@ func (this *OilTechnologyServiceController) UpdateCodeEntity() {
 			model.Name = classall.Name2
 			err = svc.UpdateEntityBytbl(OilTechnologyServiceClassName, classall.Id2, &model, colsName)
 			if model2.Name != model.Name && classall.Name3 == "" && classall.Name4 == "" {
-				err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &model, []string{"Name"}, "SubClassId = " + id + " and SupplierTypeCode = '03' and Name = '" + model2.Name + "'")
+				err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &model, []string{"Name"}, "SubClassId = "+id+" and SupplierTypeCode = '03' and Name = '"+model2.Name+"'")
 			}
 		}
 	}
@@ -530,7 +530,7 @@ func (this *OilTechnologyServiceController) UpdateCodeEntity() {
 			model.Name = classall.Name3
 			err = svc.UpdateEntityBytbl(OilTechnologyServiceClassName, classall.Id3, &model, colsName)
 			if model2.Name != model.Name && classall.Name4 == "" {
-				err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &model, []string{"Name"}, "SubClassId = " + id + " and SupplierTypeCode = '03' and Name = '" + model2.Name + "'")
+				err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &model, []string{"Name"}, "SubClassId = "+id+" and SupplierTypeCode = '03' and Name = '"+model2.Name+"'")
 			}
 		}
 	}
@@ -547,7 +547,7 @@ func (this *OilTechnologyServiceController) UpdateCodeEntity() {
 			model.Name = classall.Name4
 			err = svc.UpdateEntityBytbl(OilTechnologyServiceClassName, classall.Id4, &model, colsName)
 			if model2.Name != model.Name {
-				err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &model, []string{"Name"}, "SubClassId = " + id + " and SupplierTypeCode = '03' and Name = '" + model2.Name + "'")
+				err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &model, []string{"Name"}, "SubClassId = "+id+" and SupplierTypeCode = '03' and Name = '"+model2.Name+"'")
 			}
 		}
 	}
@@ -805,6 +805,97 @@ func (this *OilTechnologyServiceController) ExportExcelAll() {
 	fmt.Println(elapsed)
 }
 
+// @Title get 导出ex
+// @Description get SampleType by token
+// @Success 200 {object} sampletype.SampleType
+// @router /export-new [get]
+func (this *OilTechnologyServiceController) ExportAptitudeExcelByJava() {
+
+	//获取分页信息
+	where := " 1=1 "
+	orderby := "Code"
+	asc := true
+	Order := this.GetString("Order")
+	Prop := this.GetString("Prop")
+	if Order != "" && Prop != "" {
+		orderby = Prop
+		if Order == "asc" {
+			asc = true
+		} else {
+			asc = false
+		}
+	}
+	var titleCode []string
+	//自定义显示列
+	showColumnArr := this.GetString("showcolumnarr")
+	titleName := strings.Split(showColumnArr, ",")
+	showColumnNameArr := this.GetString("showcolumnnamearr")
+	titleString := showColumnNameArr
+	titleCode = strings.Split(titleString, ",")
+	//t := time.Now()
+	svc := technologyservice.GetOilTechnologyServiceService(utils.DBE)
+	var list []technologyservice.OilTechnologyServiceView
+	svc.GetMyPagingEntitiesWithOrderBytbl(OilTechsrvDetailViewName, 0, 0, orderby, asc, &list, where)
+
+	var listRes []technologyservice.OilTechnologyServiceViewVM
+	paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+	//"营业执照,组织代码,组织机构代码证,税务登记证,税务登记,开户许可,银行开户许可证,承诺书,诚信合规承诺书,企业信息系统截图,战略合作协议扫描件,"
+	mustField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MustFieldName")
+	for _, item := range list {
+		var enumModel technologyservice.OilTechnologyServiceView
+		var itemTmp technologyservice.OilTechnologyServiceViewVM
+		tmpModel := &item
+		enumModel = *tmpModel
+		immuModel := reflect.ValueOf(&enumModel)
+		elem := immuModel.Elem()
+		allNeedAptitude := ""
+
+		for i := 0; i < len(titleCode); i++ {
+			code := titleCode[i]
+			name := titleName[i]
+			if !strings.Contains(mustField, name) {
+				if strings.HasPrefix(code, "F") {
+					var val = elem.FieldByName(code).String()
+					if val == "1" {
+						if allNeedAptitude == "" {
+							allNeedAptitude = titleName[i]
+						} else {
+							allNeedAptitude = allNeedAptitude + "，" + titleName[i]
+						}
+					}
+				} else {
+					fmt.Println("没了")
+				}
+			}
+		}
+		itemTmp.Code1 = item.Code1
+		itemTmp.Name1 = item.Name1
+		itemTmp.Code2 = item.Code2
+		itemTmp.Name2 = item.Name2
+		itemTmp.Code3 = item.Code3
+		itemTmp.Name3 = item.Name3
+		itemTmp.Code4 = item.Code4
+		itemTmp.Name4 = item.Name4
+		itemTmp.OrgName = item.OrgName
+		itemTmp.AllNeedApName = allNeedAptitude
+		listRes = append(listRes, itemTmp)
+	}
+
+	fileName := "服务类资质配置导出表.xlsx"
+	Url := utils.Cfg.MustValue("workflow", "AptitudeExcel")
+
+	var dataMap = make(map[string]interface{})
+	dataMap["data"] = listRes
+	svcActiviti := workflow.GetActivitiService(utils.DBE)
+	retDocUrl := svcActiviti.ExportAptitudeExcel(dataMap, "2", Url, fileName)
+	var dataInfo ErrorDataInfo
+	dataInfo.Code = 0
+	dataInfo.Item = retDocUrl
+	dataInfo.Message = "导出成功"
+	this.Data["json"] = &dataInfo
+	this.ServeJSON()
+}
+
 // @Title 获取所有
 // @Description
 // @Success 200 {object}
@@ -2357,38 +2448,38 @@ func (this *OilTechnologyServiceController) InsertSupplierNew() {
 	SupplierName := this.GetString("SupplierName")
 	var zcgf supplier.TmpZcgf
 	svc := technologyservice.GetOilTechnologyServiceService(utils.DBE)
-	svc.GetEntityByOrderbyWhere("企业名称 = '" + SupplierName + "'", &zcgf)
+	svc.GetEntityByOrderbyWhere("企业名称 = '"+SupplierName+"'", &zcgf)
 	var errinfo ErrorInfo
-	if zcgf.Sub != ""{
+	if zcgf.Sub != "" {
 		subs := strings.Split(zcgf.Sub, ";")
-		for _,sub := range subs {
+		for _, sub := range subs {
 			if sub == "" {
 				continue
 			}
 			s := strings.Split(sub, " ")
 			var tecDifferent supplier.ManualDelete
-			svc.GetEntityByWhere("TecDifferent", "Name = '" + s[1] + "'", &tecDifferent)
+			svc.GetEntityByWhere("TecDifferent", "Name = '"+s[1]+"'", &tecDifferent)
 
 			var supp supplier.OilSupplier
-			svc.GetEntityByWhere (OilSupplierName, "SupplierName = '" + SupplierName + "'", &supp)
+			svc.GetEntityByWhere(OilSupplierName, "SupplierName = '"+SupplierName+"'", &supp)
 
 			var cert suppliercert.OilSupplierCert
-			svc.GetEntityByWhere (OilSupplierCertName, "SupplierId = " + strconv.Itoa(supp.Id), &cert)
+			svc.GetEntityByWhere(OilSupplierCertName, "SupplierId = "+strconv.Itoa(supp.Id), &cert)
 
 			var sub1 suppliercertsub.OilSupplierCertSub
 
 			if zcgf.Code == "物资类" {
 				var class technologyserviceclass.OilTechnologyServiceClass
-				s1 := strings.TrimLeft (s[0], "BM")
-				svc.GetEntityByWhere(OilTechnologyServiceClassName, "Code = '" + s1 + "'", &class)
+				s1 := strings.TrimLeft(s[0], "BM")
+				svc.GetEntityByWhere(OilTechnologyServiceClassName, "Code = '"+s1+"'", &class)
 			}
 			if zcgf.Code == "基建类" {
 				var class technologyserviceclass.OilTechnologyServiceClass
-				svc.GetEntityByWhere(OilTechnologyServiceClassName, "Name = '" + s[1] + "'", &class)
+				svc.GetEntityByWhere(OilTechnologyServiceClassName, "Name = '"+s[1]+"'", &class)
 			}
 			if zcgf.Code == "技术服务类" {
 				var class technologyserviceclass.OilTechnologyServiceClass
-				svc.GetEntityByWhere(OilTechnologyServiceClassName, "Name = '" + s[1] + "'", &class)
+				svc.GetEntityByWhere(OilTechnologyServiceClassName, "Name = '"+s[1]+"'", &class)
 				if tecDifferent.Code == "" {
 					sub1.Code = class.Code
 					sub1.Name = s[1]